Apache/openjpa
1
0
Fork 0
mirror of https://github.com/apache/openjpa.git synced 2025-03-01 14:09:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-368. Committing Vikram's patch.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@581443 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Patrick Linskey 2007-10-03 00:15:12 +00:00
parent fab1a92046
commit 5ef181ab94
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java
View File

@ -45,7 +45,7 @@ public abstract class AbstractJDBCSeq
protected int type = TYPE_DEFAULT; protected int type = TYPE_DEFAULT;
protected Object current = null; protected Object current = null;
private transient Transaction _outerTransaction; private static ThreadLocal _outerTransaction = new ThreadLocal();
/** /**
* Records the sequence type. * Records the sequence type.
@ -155,7 +155,7 @@ public abstract class AbstractJDBCSeq
try { try {
TransactionManager tm = getConfiguration() TransactionManager tm = getConfiguration()
.getManagedRuntimeInstance().getTransactionManager(); .getManagedRuntimeInstance().getTransactionManager();
_outerTransaction = tm.suspend(); _outerTransaction.set(tm.suspend());
tm.begin(); tm.begin();
return store.getConnection(); return store.getConnection();
} catch (Exception e) { } catch (Exception e) {
@ -188,13 +188,14 @@ public abstract class AbstractJDBCSeq
tm.commit(); tm.commit();
try { conn.close(); } catch (SQLException se) {} try { conn.close(); } catch (SQLException se) {}
if (_outerTransaction != null) Transaction outerTxn = (Transaction)_outerTransaction.get();
tm.resume(_outerTransaction); if (outerTxn != null)
tm.resume(outerTxn);
} catch (Exception e) { } catch (Exception e) {
throw new StoreException(e); throw new StoreException(e);
} finally { } finally {
_outerTransaction = null; _outerTransaction.set(null);
} }
} else { } else {
try { try {