[jboss-cvs] JBossAS SVN: r63567 - branches/Branch_4_2/transaction/src/main/org/jboss/tm.

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

Author: dimitris at jboss.org
Date: 2007-06-19 06:38:38 -0400 (Tue, 19 Jun 2007)
New Revision: 63567

Modified:
   branches/Branch_4_2/transaction/src/main/org/jboss/tm/TxUtils.java
Log:
add utility methods

Modified: branches/Branch_4_2/transaction/src/main/org/jboss/tm/TxUtils.java
===================================================================
--- branches/Branch_4_2/transaction/src/main/org/jboss/tm/TxUtils.java	2007-06-19 09:38:42 UTC (rev 63566)
+++ branches/Branch_4_2/transaction/src/main/org/jboss/tm/TxUtils.java	2007-06-19 10:38:38 UTC (rev 63567)
@@ -37,7 +37,7 @@
  * @author <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  * @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
- * @version $Revision:$
+ * @version $Revision$
  */
 public class TxUtils
 {
@@ -66,9 +66,13 @@
 
    public static boolean isActive(Transaction tx)
    {
+      if (tx == null)
+         return false;
+      
       try
       {
-         return tx != null && (tx.getStatus() == Status.STATUS_ACTIVE);
+         int status = tx.getStatus();
+         return isActive(status);
       }
       catch (SystemException error)
       {
@@ -92,7 +96,8 @@
    {
       try
       {
-         return ut.getStatus() == Status.STATUS_ACTIVE;
+         int status = ut.getStatus();
+         return isActive(status);
       }
       catch (SystemException error)
       {
@@ -100,14 +105,20 @@
       }
    }
 
+   public static boolean isActive(int status)
+   {
+      return status == Status.STATUS_ACTIVE;
+   }
+   
    public static boolean isUncommitted(Transaction tx)
    {
+      if (tx == null)
+         return false;
+      
       try
       {
-         if (tx == null)
-            return false;
          int status = tx.getStatus();
-         return status == Status.STATUS_ACTIVE || status == Status.STATUS_MARKED_ROLLBACK;
+         return isUncommitted(status);
       }
       catch (SystemException error)
       {
@@ -132,7 +143,8 @@
       try
       {
          int status = ut.getStatus();
-         return status == Status.STATUS_ACTIVE || status == Status.STATUS_MARKED_ROLLBACK;
+         return isUncommitted(status);
+         
       }
       catch (SystemException error)
       {
@@ -140,16 +152,21 @@
       }
    }
 
+   public static boolean isUncommitted(int status)
+   {
+      return status == Status.STATUS_ACTIVE
+          || status == Status.STATUS_MARKED_ROLLBACK;
+   }
+   
    public static boolean isCompleted(Transaction tx)
    {
+      if (tx == null)
+         return true;
+      
       try
       {
-         if (tx == null)
-            return true;
          int status = tx.getStatus();
-         return status == Status.STATUS_COMMITTED
-             || status == Status.STATUS_ROLLEDBACK
-             || status == Status.STATUS_NO_TRANSACTION;
+         return isCompleted(status);
       }
       catch (SystemException error)
       {
@@ -174,9 +191,8 @@
       try
       {
          int status = ut.getStatus();
-         return status == Status.STATUS_COMMITTED
-             || status == Status.STATUS_ROLLEDBACK
-             || status == Status.STATUS_NO_TRANSACTION;
+         return isCompleted(status);
+         
       }
       catch (SystemException error)
       {
@@ -184,17 +200,22 @@
       }
    }
    
+   public static boolean isCompleted(int status)
+   {
+      return status == Status.STATUS_COMMITTED
+          || status == Status.STATUS_ROLLEDBACK
+          || status == Status.STATUS_NO_TRANSACTION;
+   }
+   
    public static boolean isRollback(Transaction tx)
    {
+      if (tx == null)
+         return false;
+      
       try
       {
-         if (tx == null)
-            return false;
-         
          int status = tx.getStatus();
-         return status == Status.STATUS_MARKED_ROLLBACK
-             || status == Status.STATUS_ROLLING_BACK
-             || status == Status.STATUS_ROLLEDBACK;
+         return isRollback(status);
       }
       catch (SystemException error)
       {
@@ -219,9 +240,7 @@
       try
       {
          int status = ut.getStatus();
-         return status == Status.STATUS_MARKED_ROLLBACK
-         	|| status == Status.STATUS_ROLLING_BACK
-         	|| status == Status.STATUS_ROLLEDBACK;
+         return isRollback(status);
       }
       catch (SystemException error)
       {
@@ -229,6 +248,13 @@
       }
    }
    
+   public static boolean isRollback(int status)
+   {
+      return status == Status.STATUS_MARKED_ROLLBACK
+          || status == Status.STATUS_ROLLING_BACK
+          || status == Status.STATUS_ROLLEDBACK;      
+   }
+   
    /**
     * Converts a tx Status index to a String
     *