[Hibernate-commits] Hibernate3/src/org/hibernate/transaction CacheSynchronization.java,1.8,1.9 JDBCTransaction.java,1.17,1.18 JTATransaction.java,1.17,1.18 TransactionFactory.java,1.7,1.8

[<ste...@us...>]

Update of /cvsroot/hibernate/Hibernate3/src/org/hibernate/transaction
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22151/src/org/hibernate/transaction

Modified Files:
	CacheSynchronization.java JDBCTransaction.java 
	JTATransaction.java TransactionFactory.java 
Log Message:
HHH-1287 : more websphere transaction issues (yaay!)

Index: CacheSynchronization.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/transaction/CacheSynchronization.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CacheSynchronization.java	15 Aug 2005 09:23:05 -0000	1.8
+++ CacheSynchronization.java	8 Feb 2006 22:34:34 -0000	1.9
@@ -85,7 +85,7 @@
 			jdbcContext.afterTransactionCompletion(status==Status.STATUS_COMMITTED, hibernateTransaction);
 		}
 		finally {
-			if ( ctx.shouldAutoClose() && ctx.isOpen() ) {
+			if ( ctx.shouldAutoClose() && !ctx.isClosed() ) {
 				log.trace("automatically closing session");
 				ctx.managedClose();
 			}

Index: JDBCTransaction.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/transaction/JDBCTransaction.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- JDBCTransaction.java	28 Oct 2005 10:17:26 -0000	1.17
+++ JDBCTransaction.java	8 Feb 2006 22:34:34 -0000	1.18
@@ -84,7 +84,7 @@
 	}
 	
 	private void closeIfRequired() throws HibernateException {
-		if ( callback && transactionContext.shouldAutoClose() && transactionContext.isOpen() ) {
+		if ( callback && transactionContext.shouldAutoClose() && !transactionContext.isClosed() ) {
 			try {
 				transactionContext.managedClose();
 			}

Index: JTATransaction.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/transaction/JTATransaction.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- JTATransaction.java	29 Sep 2005 23:33:29 -0000	1.17
+++ JTATransaction.java	8 Feb 2006 22:34:34 -0000	1.18
@@ -318,7 +318,7 @@
 	private void closeIfRequired() throws HibernateException {
 		boolean close = callback && 
 				transactionContext.shouldAutoClose() && 
-				transactionContext.isOpen();
+				!transactionContext.isClosed();
 		if ( close ) {
 			transactionContext.managedClose();
 		}

Index: TransactionFactory.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/transaction/TransactionFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- TransactionFactory.java	10 Dec 2005 17:25:32 -0000	1.7
+++ TransactionFactory.java	8 Feb 2006 22:34:34 -0000	1.8
@@ -22,7 +22,8 @@
 
 	public static interface Context {
 		public SessionFactoryImplementor getFactory();
-		public boolean isOpen();
+//		public boolean isOpen();
+		public boolean isClosed();
 
 		public boolean isFlushModeNever();
 		public boolean isFlushBeforeCompletionEnabled();