[jboss-svn-commits] JBL Code SVN: r37761 - labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator.

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

Author: jhalliday
Date: 2011-12-01 05:28:12 -0500 (Thu, 01 Dec 2011)
New Revision: 37761

Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java
Log:
JTS cleanup leak fix (redux). JBTM-770


Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java	2011-12-01 10:27:14 UTC (rev 37760)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/coordinator/ArjunaTransactionImple.java	2011-12-01 10:28:12 UTC (rev 37761)
@@ -1580,14 +1580,14 @@
 	            }
 	        }
 	    }
-	    
+
 	    /*
 	     * If there's no problem so far then call beforeCompletion on the underlying TwoPhaseCoordinator.
 	     */
 
         if (!problem)
             problem = !super.beforeCompletion();
-	    
+
 	    if (problem)
 	    {
 	        if (exp != null)
@@ -1729,13 +1729,10 @@
 	        _synchs = null;
 	    }
 
-        /*
-        * If there's no problem so far then call afterCompletion on the underlying TwoPhaseCoordinator.
-        */
 
-        problem = !super.afterCompletion(myStatus == Status.StatusCommitted ? ActionStatus.COMMITTED : ActionStatus.ABORTED);
+        boolean superProblem = !super.afterCompletion(myStatus == Status.StatusCommitted ? ActionStatus.COMMITTED : ActionStatus.ABORTED);
 
-        if (problem)
+        if (problem || superProblem)
 	    {
 	        if (exp != null)
 	            throw exp;