You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by ss...@apache.org on 2008/07/28 21:08:57 UTC
svn commit: r680444 -
/openjpa/branches/0.9.7-r547073/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java
Author: ssegu
Date: Mon Jul 28 12:08:56 2008
New Revision: 680444
URL: http://svn.apache.org/viewvc?rev=680444&view=rev
Log:
OPENJPA-368. Committing Vikram's patch. (Merge back into branch from trunk)
Modified:
openjpa/branches/0.9.7-r547073/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java
Modified: openjpa/branches/0.9.7-r547073/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java
URL: http://svn.apache.org/viewvc/openjpa/branches/0.9.7-r547073/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java?rev=680444&r1=680443&r2=680444&view=diff
==============================================================================
--- openjpa/branches/0.9.7-r547073/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java (original)
+++ openjpa/branches/0.9.7-r547073/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java Mon Jul 28 12:08:56 2008
@@ -45,7 +45,7 @@
protected int type = TYPE_DEFAULT;
protected Object current = null;
- private transient Transaction _outerTransaction;
+ private static ThreadLocal _outerTransaction = new ThreadLocal();
/**
* Records the sequence type.
@@ -155,7 +155,7 @@
try {
TransactionManager tm = getConfiguration()
.getManagedRuntimeInstance().getTransactionManager();
- _outerTransaction = tm.suspend();
+ _outerTransaction.set(tm.suspend());
tm.begin();
return store.getConnection();
} catch (Exception e) {
@@ -188,13 +188,14 @@
tm.commit();
try { conn.close(); } catch (SQLException se) {}
- if (_outerTransaction != null)
- tm.resume(_outerTransaction);
+ Transaction outerTxn = (Transaction)_outerTransaction.get();
+ if (outerTxn != null)
+ tm.resume(outerTxn);
} catch (Exception e) {
throw new StoreException(e);
} finally {
- _outerTransaction = null;
+ _outerTransaction.set(null);
}
} else {
try {