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

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

Author: jhalliday
Date: 2010-07-13 08:29:58 -0400 (Tue, 13 Jul 2010)
New Revision: 33853

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
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 11:42:15 UTC (rev 33852)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java	2010-07-13 12:29:58 UTC (rev 33853)
@@ -1332,7 +1332,15 @@
      * @return
      */
     public boolean isAlive() {
-        return _transactions.containsKey(this.get_uid());
+        try {
+            if(_theTransaction != null) {
+                return _transactions.containsKey(this.get_uid());
+            } else {
+                return false;
+            }
+        } catch(NullPointerException e) {
+            return false; // there is no tx/action, therefore it's not alive.
+        }
     }
 
     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 11:42:15 UTC (rev 33852)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java	2010-07-13 12:29:58 UTC (rev 33853)
@@ -1297,7 +1297,15 @@
      * @return
      */
     public boolean isAlive() {
-        return _transactions.containsKey(this.get_uid());
+        try {
+            if(_theTransaction != null) {
+                return _transactions.containsKey(this.get_uid());
+            } else {
+                return false;
+            }
+        } catch(NullPointerException e) {
+            return false; // there is no tx/action, therefore it's not alive.
+        }
     }