[Hibernate-commits] Hibernate3/src/org/hibernate/jdbc ConnectionManager.java,1.24.2.2,1.24.2.3

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

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

Modified Files:
      Tag: Branch_3_1
	ConnectionManager.java 
Log Message:
more websphere fun

Index: ConnectionManager.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate3/src/org/hibernate/jdbc/ConnectionManager.java,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -u -d -r1.24.2.2 -r1.24.2.3
--- ConnectionManager.java	3 Feb 2006 20:18:39 -0000	1.24.2.2
+++ ConnectionManager.java	15 Feb 2006 20:15:24 -0000	1.24.2.3
@@ -198,17 +198,21 @@
 	 * @return True if the connections will be released after each statement; false otherwise.
 	 */
 	public boolean isAggressiveRelease() {
-		boolean inAutoCommitState;
-		try {
-			inAutoCommitState = !callback.isTransactionInProgress() && isAutoCommit();
+		if ( releaseMode == ConnectionReleaseMode.AFTER_STATEMENT ) {
+			return true;
 		}
-		catch( SQLException e ) {
-			// assume we are in an auto-commit state
-			inAutoCommitState = true;
+		else if ( releaseMode == ConnectionReleaseMode.AFTER_TRANSACTION ) {
+			boolean inAutoCommitState;
+			try {
+				inAutoCommitState = isAutoCommit()&& !callback.isTransactionInProgress();
+			}
+			catch( SQLException e ) {
+				// assume we are in an auto-commit state
+				inAutoCommitState = true;
+			}
+			return inAutoCommitState;
 		}
-		// release connections
-		return releaseMode == ConnectionReleaseMode.AFTER_STATEMENT  ||
-		       ( releaseMode == ConnectionReleaseMode.AFTER_TRANSACTION && inAutoCommitState );
+		return false;
 	}
 
 	/**