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

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

Author: bdecoste
Date: 2006-09-19 23:16:43 -0400 (Tue, 19 Sep 2006)
New Revision: 56988

Modified:
   trunk/aspects/src/main/org/jboss/aspects/tx/TxInterceptor.java
Log:
removed remaining TxManager.getInstance() calls for plugable TransactionManagers

Modified: trunk/aspects/src/main/org/jboss/aspects/tx/TxInterceptor.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aspects/tx/TxInterceptor.java	2006-09-20 03:16:34 UTC (rev 56987)
+++ trunk/aspects/src/main/org/jboss/aspects/tx/TxInterceptor.java	2006-09-20 03:16:43 UTC (rev 56988)
@@ -156,6 +156,8 @@
 
    public static class Required implements Interceptor
    {
+      private static final Logger log = Logger.getLogger(Required.class);
+      
       protected TransactionManager tm;
       protected TxPolicy policy;
       protected int timeout;
@@ -174,9 +176,9 @@
 
       public Object invoke(Invocation invocation) throws Throwable
       {
-         org.jboss.tm.TxManager txManager = (org.jboss.tm.TxManager)tm;
+         org.jboss.tm.TxManager txManager = null;
          int oldTimeout = 0;
-         
+            
          if (tm instanceof org.jboss.tm.TxManager)
          {
             txManager = (org.jboss.tm.TxManager)tm;
@@ -191,7 +193,7 @@
             }
                
             Transaction tx = tm.getTransaction();
-          
+            
             if (tx == null)
             {
                return policy.invokeInOurTx(invocation, tm);
@@ -241,7 +243,7 @@
 
       public Object invoke(Invocation invocation) throws Throwable
       {
-         org.jboss.tm.TxManager txManager = (org.jboss.tm.TxManager)tm;
+         org.jboss.tm.TxManager txManager = null;
          int oldTimeout = 0;
          
          if (tm instanceof org.jboss.tm.TxManager)