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

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

Author: tomjenkinson
Date: 2011-10-15 18:36:39 -0400 (Sat, 15 Oct 2011)
New Revision: 37559

Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/IsolatableServersClassLoader.java
Log:
JBTM-916 updated to load the logger

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java	2011-10-15 22:17:11 UTC (rev 37558)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/SimpleIsolatedServers.java	2011-10-15 22:36:39 UTC (rev 37559)
@@ -57,7 +57,7 @@
 		if (file.exists()) {
 			file.delete();
 		}
-		int startingTimeout = 0;
+		int startingTimeout = 10;
 
 		// Start out at the first server
 		LocalServer originalServer = getLocalServer(1000);
@@ -73,7 +73,7 @@
 		// down
 		Transaction suspendedTransaction = transactionManager.suspend();
 		long timeLeftBeforeTransactionTimeout = originalServer.getTimeLeftBeforeTransactionTimeout();
-		List<Integer> nodesToFlowTo = new LinkedList<Integer>(Arrays.asList(new Integer[] { 2000, 3000, 2000, 1000 }));
+		List<Integer> nodesToFlowTo = new LinkedList<Integer>(Arrays.asList(new Integer[] { 2000, 3000, 2000, 1000, 2000, 3000, 1000, 3000 }));
 		boolean proxyRequired = recursivelyFlowTransaction(nodesToFlowTo, timeLeftBeforeTransactionTimeout, toMigrate);
 		transactionManager.resume(suspendedTransaction);
 		if (proxyRequired) {

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/IsolatableServersClassLoader.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/IsolatableServersClassLoader.java	2011-10-15 22:17:11 UTC (rev 37558)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/IsolatableServersClassLoader.java	2011-10-15 22:36:39 UTC (rev 37559)
@@ -47,19 +47,21 @@
 			clazz = clazzMap.get(name);
 		}
 
-		if (!name.startsWith("com.arjuna") || (ignoredPackage != null && name.matches(ignoredPackage + ".[A-Za-z0-9]*")) || name.contains("logging")) {
+		if (!name.startsWith("com.arjuna") || (ignoredPackage != null && name.matches(ignoredPackage + ".[A-Za-z0-9]*"))) {
 			clazz = super.loadClass(name);
 		} else {
 
 			String path = name.replace('.', '/').concat(".class");
 			Resource res = ucp.getResource(path, false);
+			if (res == null) {
+				throw new ClassNotFoundException(name);
+			}
 			try {
 				byte[] classData = res.getBytes();
 				clazz = defineClass(name, classData, 0, classData.length);
 				clazzMap.put(name, clazz);
 			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				throw new ClassNotFoundException(name, e);
 			}
 		}