[jboss-svn-commits] JBL Code SVN: r37822 - in labs/jbosstm/trunk/XTS: recovery/src/org/jboss/jbossts/xts/recovery/participant/at and 1 other directories.

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

Author: zhfeng
Date: 2011-12-20 22:00:33 -0500 (Tue, 20 Dec 2011)
New Revision: 37822

Modified:
   labs/jbosstm/trunk/XTS/localjunit/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/TestATSubordinateCrashDuringPrepare.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManagerImple.java
   labs/jbosstm/trunk/XTS/sar/tests/pom.xml
Log:
JBTM-1011 update to apply fix for XTSATRecoveryManagerImple

Modified: labs/jbosstm/trunk/XTS/localjunit/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/TestATSubordinateCrashDuringPrepare.java
===================================================================
--- labs/jbosstm/trunk/XTS/localjunit/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/TestATSubordinateCrashDuringPrepare.java	2011-12-19 11:16:57 UTC (rev 37821)
+++ labs/jbosstm/trunk/XTS/localjunit/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/TestATSubordinateCrashDuringPrepare.java	2011-12-21 03:00:33 UTC (rev 37822)
@@ -1,7 +1,6 @@
 package com.arjuna.qa.junit;
 
 import org.jboss.arquillian.junit.Arquillian;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -11,7 +10,6 @@
 		scriptName = "ATSubordinateCrashDuringPrepare";
 	}
 	
-	@Ignore("Not stop with byteman when recovering")
 	@Test
 	public void subordinateMultiParticipantPrepareAndCommitTest() throws Exception {
 		testName = "subordinate.MultiParticipantPrepareAndCommitTest";

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManagerImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManagerImple.java	2011-12-19 11:16:57 UTC (rev 37821)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/participant/at/XTSATRecoveryManagerImple.java	2011-12-21 03:00:33 UTC (rev 37822)
@@ -260,7 +260,7 @@
 
         SubordinateATCoordinator[] coordinators = SubordinateATCoordinator.listRecoveredCoordinators();
         for (SubordinateATCoordinator coordinator : coordinators) {
-            if (coordinator.getSubordinateType() == SubordinateATCoordinator.SUBORDINATE_TX_TYPE_AT_AT && coordinator.isOrphaned()) {
+            if (coordinator.getSubordinateType().equals(SubordinateATCoordinator.SUBORDINATE_TX_TYPE_AT_AT) && coordinator.isOrphaned()) {
                 RecoveryLogger.i18NLogger.warn_participant_at_XTSATRecoveryModule_5(coordinator.get_uid());
                 coordinator.rollback();
             }

Modified: labs/jbosstm/trunk/XTS/sar/tests/pom.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/pom.xml	2011-12-19 11:16:57 UTC (rev 37821)
+++ labs/jbosstm/trunk/XTS/sar/tests/pom.xml	2011-12-21 03:00:33 UTC (rev 37822)
@@ -35,7 +35,7 @@
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 					<archive>
 						<manifestEntries>
-					   		<Dependencies>org.jboss.xts,org.jboss.ws.cxf.jbossws-cxf-client services export</Dependencies>
+					   		<Dependencies>org.jboss.jts,org.jboss.ws.api,javax.xml.ws.api,org.jboss.xts,org.jboss.ws.jaxws-client services export,org.jboss.ws.cxf.jbossws-cxf-client services export</Dependencies>
 						</manifestEntries>
 					</archive>
 					<webXml>