[jboss-svn-commits] JBL Code SVN: r36883 - labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific.

[jboss-svn-commits at lists.jboss.org]

Author: mmusgrov
Date: 2011-04-11 10:10:24 -0400 (Mon, 11 Apr 2011)
New Revision: 36883

Modified:
   labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/ControlImple.java
Log:
[JBTM-748] Make sure the CORBA object representing a transaction is shut down before invalidating the transaction handle

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/ControlImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/ControlImple.java	2011-04-11 11:48:21 UTC (rev 36882)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/ControlImple.java	2011-04-11 14:10:24 UTC (rev 36883)
@@ -257,25 +257,25 @@
 			removeControl();
 
 			/*
-			 * If this is a proxy then there won't be a local transaction
-			 * implementation.
+			 * We do a lazy connect to the ORB, so we may never have to do a
+			 * disconnect either.
 			 */
 
-			if (_transactionHandle != null)
+			if (_myControl != null)
 			{
-				_transactionHandle.setControlHandle(null); // for gc
-				_transactionHandle = null;
+				ORBManager.getPOA().shutdownObject(this);
+				_myControl = null;
 			}
 
 			/*
-			 * We do a lazy connect to the ORB, so we may never have to do a
-			 * disconnect either.
+			 * If this is a proxy then there won't be a local transaction
+			 * implementation.
 			 */
 
-			if (_myControl != null)
+			if (_transactionHandle != null)
 			{
-				ORBManager.getPOA().shutdownObject(this);
-				_myControl = null;
+				_transactionHandle.setControlHandle(null); // for gc
+				_transactionHandle = null;
 			}
 
 			tidyup();