Updated to close the transactional driver connection if the driver is…

… not in the list of drivers that require modifiers
gytis · Jan 12, 2015 · ef51072 · ef51072
1 parent 866db77
commit ef51072
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java b/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionImple.java
@@ -379,8 +379,7 @@ public void close() throws SQLException
 
 	        if (!delayClose)  // close now
 	        {
-	            if (_theModifier != null)
-	                _transactionalDriverXAConnectionConnection.closeCloseCurrentConnection();
+	            _transactionalDriverXAConnectionConnection.closeCloseCurrentConnection();
 
 
 	            if (_theConnection != null && !_theConnection.isClosed())

diff --git a/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/drivers/modifiers/list.java b/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/drivers/modifiers/list.java
@@ -38,8 +38,7 @@ public list ()
 		for (String driver : new String[] { "jConnect (TM) for JDBC (TM)",
 				"Oracle JDBC driver",
 				"IBM DB2 JDBC Universal Driver Architecture",
-				"MySQL Connector Java",
-		        "H2 JDBC Driver"}) {
+				"MySQL Connector Java"}) {
 			ModifierFactory.putModifier(driver, -1, -1,
 					IsSameRMModifier.class.getName());
 		}

diff --git a/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC2Test.java b/ArjunaJTA/jdbc/tests/classes/com/hp/mwtests/ts/jdbc/basic/JDBC2Test.java
@@ -31,6 +31,7 @@
 
 package com.hp.mwtests.ts.jdbc.basic;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
 
 import java.sql.Connection;
@@ -267,7 +268,7 @@ public void test() throws Exception
 
             tx.begin();
 
-            conn.isClosed(); //  this will blow up the underlying TransactionalDriverXAConnection still thinks its associated with an old txn
+            assertFalse(conn.isClosed());
 
             if (!reuseconn)
             {