[jboss-svn-commits] JBL Code SVN: r33852 - in labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP: ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts and 1 other directories.

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

Author: jhalliday
Date: 2010-07-13 07:42:15 -0400 (Tue, 13 Jul 2010)
New Revision: 33852

Modified:
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
   labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/build.xml
Log:
Improve TransactionImple.isAlive  JBTM-757


Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java	2010-07-13 09:28:54 UTC (rev 33851)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java	2010-07-13 11:42:15 UTC (rev 33852)
@@ -1332,7 +1332,7 @@
      * @return
      */
     public boolean isAlive() {
-        return _transactions.contains(this);
+        return _transactions.containsKey(this.get_uid());
     }
 
     protected TransactionImple()

Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java	2010-07-13 09:28:54 UTC (rev 33851)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java	2010-07-13 11:42:15 UTC (rev 33852)
@@ -1297,7 +1297,7 @@
      * @return
      */
     public boolean isAlive() {
-        return _transactions.contains(this);
+        return _transactions.containsKey(this.get_uid());
     }
 
 

Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/build.xml	2010-07-13 09:28:54 UTC (rev 33851)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/atsintegration/build.xml	2010-07-13 11:42:15 UTC (rev 33852)
@@ -131,7 +131,7 @@
         -->
 
         <!-- jboss-common-core.jar has UnexpectedThrowable, jboss-logging-spi.jar has Logger, jboss-main.jar has ServerConfig -->
-        <property name="jboss.libs" value="jboss-common-core.jar jboss-logging-spi.jar jboss-bootstrap.jar"/>
+        <property name="jboss.libs" value="jboss-common-core.jar jboss-logging-spi.jar jboss-bootstrap.jar jbosssx.jar"/>
         <!-- jboss-integration.jar has the transactions SPI, jmx-adaptor-plugin.jar has RMIAdaptor, jbosssx has security -->
         <property name="jboss.common.shared.jta.libs" value="jboss-integration.jar jmx-adaptor-plugin.jar jbosssx.jar"/>