Update of /cvsroot/hibernate/Hibernate3/src/org/hibernate/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28070/src/org/hibernate/impl
Modified Files:
Tag: Branch_3_1
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.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- AbstractSessionImpl.java 11 Jan 2006 22:38:05 -0000 1.5
+++ AbstractSessionImpl.java 8 Feb 2006 22:47:33 -0000 1.5.2.1
@@ -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.178
retrieving revision 1.178.2.1
diff -u -d -r1.178 -r1.178.2.1
--- SessionImpl.java 1 Feb 2006 19:58:27 -0000 1.178
+++ SessionImpl.java 8 Feb 2006 22:47:33 -0000 1.178.2.1
@@ -341,7 +341,7 @@
}
public boolean shouldAutoClose() {
- return isAutoCloseSessionEnabled() && isOpen();
+ return isAutoCloseSessionEnabled() && !isClosed();
}
public void managedClose() {
@@ -1749,7 +1749,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.21.2.1
diff -u -d -r1.21 -r1.21.2.1
--- StatelessSessionImpl.java 20 Jan 2006 12:57:29 -0000 1.21
+++ StatelessSessionImpl.java 8 Feb 2006 22:47:33 -0000 1.21.2.1
@@ -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) {}
|
