[Jboss-cvs] JBossAS SVN: r57068 - trunk/aspects/src/main/org/jboss/aspects/tx

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

Author: kabir.khan at jboss.com
Date: 2006-09-22 08:44:35 -0400 (Fri, 22 Sep 2006)
New Revision: 57068

Modified:
   trunk/aspects/src/main/org/jboss/aspects/tx/TxInterceptor.java
Log:
[JBAS-3685] Remove all references to org.jboss.tm.TxManager

Modified: trunk/aspects/src/main/org/jboss/aspects/tx/TxInterceptor.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aspects/tx/TxInterceptor.java	2006-09-22 12:19:25 UTC (rev 57067)
+++ trunk/aspects/src/main/org/jboss/aspects/tx/TxInterceptor.java	2006-09-22 12:44:35 UTC (rev 57068)
@@ -26,6 +26,7 @@
 import org.jboss.aop.advice.Interceptor;
 import org.jboss.aop.joinpoint.Invocation;
 import org.jboss.logging.Logger;
+import org.jboss.tm.TransactionTimeoutConfiguration;
 
 /**
  * This interceptor handles transactions for AOP
@@ -176,20 +177,17 @@
 
       public Object invoke(Invocation invocation) throws Throwable
       {
-         org.jboss.tm.TxManager txManager = null;
          int oldTimeout = 0;
             
-         if (tm instanceof org.jboss.tm.TxManager)
+         if (tm instanceof TransactionTimeoutConfiguration)
          {
-            txManager = (org.jboss.tm.TxManager)tm;
-            oldTimeout = txManager.getTransactionTimeout();
+            oldTimeout = ((TransactionTimeoutConfiguration)tm).getTransactionTimeout();          
          }
-         
          try 
          {
-            if (timeout != -1 && txManager != null)
+            if (timeout != -1 && tm != null)
             {
-               txManager.setTransactionTimeout(timeout);
+               tm.setTransactionTimeout(timeout);
             }
                
             Transaction tx = tm.getTransaction();
@@ -243,20 +241,18 @@
 
       public Object invoke(Invocation invocation) throws Throwable
       {
-         org.jboss.tm.TxManager txManager = null;
          int oldTimeout = 0;
          
-         if (tm instanceof org.jboss.tm.TxManager)
+         if (tm instanceof TransactionTimeoutConfiguration)
          {
-            txManager = (org.jboss.tm.TxManager)tm;
-            oldTimeout = txManager.getTransactionTimeout();
+            oldTimeout = ((TransactionTimeoutConfiguration)tm).getTransactionTimeout();
          }
          
          try 
          {
-            if (timeout != -1 && txManager != null)
+            if (timeout != -1 && tm != null)
             {
-               txManager.setTransactionTimeout(timeout);
+               tm.setTransactionTimeout(timeout);
             }
             
             Transaction tx = tm.getTransaction();
@@ -279,9 +275,9 @@
          }
          finally
          {
-            if (txManager != null)
+            if (tm != null)
             {
-               txManager.setTransactionTimeout(oldTimeout);
+               tm.setTransactionTimeout(oldTimeout);
             }
          }
       }