Do not null the actual connection when delaying close. That means whe…

…n getConnection is called again after .close for this thread it allow the connection to be reused and finally closed by the Sync.
jbosstm · Jun 15, 2016 · 46a955c · 46a955c
1 parent c7627e0
commit 46a955c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 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
@@ -369,9 +369,7 @@ public void close() throws SQLException
 	                tx.registerSynchronization(new ConnectionSynchronization(null, _transactionalDriverXAConnectionConnection));
 	                if (delayClose)
 	                {
-        	                tx.registerSynchronization(new ConnectionSynchronization(_theConnection, null));
-
-                                _theConnection = null;
+        	                tx.registerSynchronization(new ConnectionSynchronization(this, null));
 	                }
 	            }
 	            else
@@ -382,11 +380,7 @@ public void close() throws SQLException
 
 	        if (!delayClose)  // close now
 	        {
-	            if (!_theConnection.isClosed()) {
-	                _theConnection.close();
-	            }
-
-	            _theConnection = null;
+	            closeImpl();
 	        }
 
 	        // what about connections without xaCon?
@@ -407,6 +401,16 @@ public void close() throws SQLException
 	    }
 	}
 
+	void closeImpl() throws SQLException {
+		try {
+			if (!_theConnection.isClosed()) {
+				_theConnection.close();
+			}
+		} finally {
+			_theConnection = null;
+		}
+	}
+
 	public boolean isClosed() throws SQLException
 	{
 		/*
@@ -860,16 +864,11 @@ final void reset()
 	{
 		try
 		{
-			if (_theConnection != null)
-				_theConnection.close();
+			closeImpl();
 		}
 		catch (Exception ex)
 		{
 		}
-		finally
-		{
-			_theConnection = null;
-		}
 	}
 
 	final java.sql.Connection getConnection() throws SQLException

diff --git a/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionSynchronization.java b/ArjunaJTA/jdbc/classes/com/arjuna/ats/internal/jdbc/ConnectionSynchronization.java
@@ -47,7 +47,7 @@
 public class ConnectionSynchronization implements Synchronization
 {
 
-    public ConnectionSynchronization (Connection conn, TransactionalDriverXAConnection rxac)
+    public ConnectionSynchronization (ConnectionImple conn, TransactionalDriverXAConnection rxac)
     {
 	_theConnection = conn;
 	_recoveryConnection = rxac;
@@ -57,8 +57,8 @@ public void afterCompletion(int status)
     {
 	try
 	{
-	    if (_theConnection != null && !_theConnection.isClosed()) {
-	        _theConnection.close();
+	    if (_theConnection != null) {
+	        _theConnection.closeImpl();
 	    }
 	}
 	catch (Exception ex)
@@ -79,7 +79,7 @@ public void beforeCompletion()
     {
     }
 
-    private Connection _theConnection = null;
+    private ConnectionImple _theConnection = null;
     private TransactionalDriverXAConnection _recoveryConnection;
 }