[hibernate-commits] Hibernate SVN: r14691 - core/trunk/core/src/main/java/org/hibernate/context.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2008-05-27 10:48:51 -0400 (Tue, 27 May 2008)
New Revision: 14691

Modified:
   core/trunk/core/src/main/java/org/hibernate/context/JTASessionContext.java
Log:
HHH-1786 : current session cleanup synch hack for WebSphere.

Modified: core/trunk/core/src/main/java/org/hibernate/context/JTASessionContext.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/context/JTASessionContext.java	2008-05-26 23:04:52 UTC (rev 14690)
+++ core/trunk/core/src/main/java/org/hibernate/context/JTASessionContext.java	2008-05-27 14:48:51 UTC (rev 14691)
@@ -118,7 +118,10 @@
 				throw new HibernateException( "Unable to register cleanup Synchronization with TransactionManager" );
 			}
 
-			currentSessionMap.put( txn, currentSession );
+			Object txnIdentifier = factory.getSettings().getTransactionManagerLookup() == null
+					? txn
+					: factory.getSettings().getTransactionManagerLookup().getTransactionIdentifier( txn );
+			currentSessionMap.put( txnIdentifier, currentSession );
 		}
 
 		return currentSession;