[jboss-svn-commits] JBL Code SVN: r37756 - 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-12-01 04:59:57 -0500 (Thu, 01 Dec 2011)
New Revision: 37756

Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/examples/classes/com/arjuna/jta/distributed/example/server/impl/ProxyXAResource.java
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResource.java
Log:
JBTM-927 make it clear that no special casing is required for timed out subordinates

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/examples/classes/com/arjuna/jta/distributed/example/server/impl/ProxyXAResource.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/examples/classes/com/arjuna/jta/distributed/example/server/impl/ProxyXAResource.java	2011-12-01 09:52:44 UTC (rev 37755)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/examples/classes/com/arjuna/jta/distributed/example/server/impl/ProxyXAResource.java	2011-12-01 09:59:57 UTC (rev 37756)
@@ -120,16 +120,8 @@
 		System.out.println("     ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_ROLLBACK[" + xid + "]");
 
 		Xid toPropagate = migratedXid != null ? migratedXid : xid;
-		try {
-			LookupProvider.getInstance().lookup(remoteServerName).rollback(toPropagate, !nonerecovered);
-			System.out.println("     ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_ROLLBACKED");
-		} catch (XAException e) {
-			// We know the remote side must have done a JBTM-917
-			if (e.errorCode == XAException.XAER_INVAL) {
-				// We know that this means that the transaction is not known at
-				// the remote side
-			}
-		}
+		LookupProvider.getInstance().lookup(remoteServerName).rollback(toPropagate, !nonerecovered);
+		System.out.println("     ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_ROLLBACKED");
 	}
 
 	/**

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResource.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResource.java	2011-12-01 09:52:44 UTC (rev 37755)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/atsintegration/tests/classes/com/arjuna/ats/jta/distributed/server/impl/ProxyXAResource.java	2011-12-01 09:59:57 UTC (rev 37756)
@@ -128,13 +128,14 @@
 			LookupProvider.getInstance().lookup(remoteServerName).rollback(toPropagate, !nonerecovered);
 			System.out.println("     ProxyXAResource (" + localServerName + ":" + remoteServerName + ") XA_ROLLBACKED");
 		} catch (XAException e) {
-			// We know the remote side must have done a JBTM-917
+			// We know the remote side must have done a JBTM-927
 			if (e.errorCode == XAException.XAER_INVAL) {
 				// We know that this means that the transaction is not known at
 				// the remote side
+				CompletionCounter.getInstance().incrementRollback(localServerName);
 			}
+			throw e;
 		}
-
 		CompletionCounter.getInstance().incrementRollback(localServerName);
 	}