[Hibernate-commits] Hibernate3/src/org/hibernate/impl AbstractSessionImpl.java,1.5,1.6 SessionImpl.java,1.179,1.180 StatelessSessionImpl.java,1.21,1.22

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

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

Modified Files:
	AbstractSessionImpl.java SessionImpl.java 
	StatelessSessionImpl.java 
Log Message:
HHH-1287 : more websphere transaction issues (yaay!)

Index: AbstractSessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/impl/AbstractSessionImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- AbstractSessionImpl.java	11 Jan 2006 22:38:05 -0000	1.5
+++ AbstractSessionImpl.java	8 Feb 2006 22:34:34 -0000	1.6
@@ -37,7 +37,7 @@
 		return factory;
 	}
 
-	protected boolean isClosed() {
+	public boolean isClosed() {
 		return closed;
 	}
 

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/impl/SessionImpl.java,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -d -r1.179 -r1.180
--- SessionImpl.java	8 Feb 2006 18:36:45 -0000	1.179
+++ SessionImpl.java	8 Feb 2006 22:34:34 -0000	1.180
@@ -341,7 +341,7 @@
 	}
 
 	public boolean shouldAutoClose() {
-		return isAutoCloseSessionEnabled() && isOpen();
+		return isAutoCloseSessionEnabled() && !isClosed();
 	}
 
 	public void managedClose() {
@@ -1748,7 +1748,7 @@
 	public String toString() {
 		StringBuffer buf = new StringBuffer(500)
 			.append( "SessionImpl(" );
-		if ( isOpen() ) {
+		if ( !isClosed() ) {
 			buf.append(persistenceContext)
 				.append(";")
 				.append(actionQueue);

Index: StatelessSessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/impl/StatelessSessionImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- StatelessSessionImpl.java	20 Jan 2006 12:57:29 -0000	1.21
+++ StatelessSessionImpl.java	8 Feb 2006 22:34:34 -0000	1.22
@@ -146,7 +146,7 @@
 	}
 
 	public void managedClose() {
-		if ( ! isOpen() ) {
+		if ( isClosed() ) {
 			throw new SessionException( "Session was already closed!" );
 		}
 		jdbcContext.getConnectionManager().close();
@@ -159,7 +159,7 @@
 	}
 
 	public boolean shouldAutoClose() {
-		return isAutoCloseSessionEnabled() && isOpen();
+		return isAutoCloseSessionEnabled() && !isClosed();
 	}
 
 	public void afterTransactionCompletion(boolean successful, Transaction tx) {}