[jboss-svn-commits] JBL Code SVN: r37610 - in labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration: tests/classes/com/arjuna/ats/jta/distributed/server/impl and 1 other directory.

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

Author: tomjenkinson
Date: 2011-10-19 12:58:37 -0400 (Wed, 19 Oct 2011)
New Revision: 37610

Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/examples/classes/com/arjuna/jta/distributed/example/server/impl/ServerImpl.java
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ServerImpl.java
Log:
JBTM-895 make sure that we do the Subordinate work in the correct classloader

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/examples/classes/com/arjuna/jta/distributed/example/server/impl/ServerImpl.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/examples/classes/com/arjuna/jta/distributed/example/server/impl/ServerImpl.java	2011-10-19 14:13:29 UTC (rev 37609)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/examples/classes/com/arjuna/jta/distributed/example/server/impl/ServerImpl.java	2011-10-19 16:58:37 UTC (rev 37610)
@@ -218,12 +218,11 @@
 		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
 		try {
 			Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
-			
+			SubordinateTransaction tx = SubordinationManager.getTransactionImporter().getImportedTransaction(xid);
+			return SubordinationManager.getXATerminator().prepare(xid);			
 		} finally {
 			Thread.currentThread().setContextClassLoader(contextClassLoader);			
 		}
-		SubordinateTransaction tx = SubordinationManager.getTransactionImporter().getImportedTransaction(xid);
-		return SubordinationManager.getXATerminator().prepare(xid);
 	}
 
 	@Override

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ServerImpl.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ServerImpl.java	2011-10-19 14:13:29 UTC (rev 37609)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ServerImpl.java	2011-10-19 16:58:37 UTC (rev 37610)
@@ -298,12 +298,11 @@
 		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
 		try {
 			Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
-
+			SubordinateTransaction tx = SubordinationManager.getTransactionImporter().getImportedTransaction(xid);
+			return SubordinationManager.getXATerminator().prepare(xid);
 		} finally {
 			Thread.currentThread().setContextClassLoader(contextClassLoader);
 		}
-		SubordinateTransaction tx = SubordinationManager.getTransactionImporter().getImportedTransaction(xid);
-		return SubordinationManager.getXATerminator().prepare(xid);
 	}
 
 	@Override