[jboss-cvs] JBossAS SVN: r70337 - projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/tx.

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

Author: bdecoste
Date: 2008-03-03 16:04:44 -0500 (Mon, 03 Mar 2008)
New Revision: 70337

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/tx/TxInterceptorFactory.java
Log:
fixed @TransactionAttribute handling

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/tx/TxInterceptorFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/tx/TxInterceptorFactory.java	2008-03-03 20:31:08 UTC (rev 70336)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/tx/TxInterceptorFactory.java	2008-03-03 21:04:44 UTC (rev 70337)
@@ -96,7 +96,7 @@
          super.initialize();
 
       TransactionAttributeType txType = getTxType(advisor, jp);
-     
+      
       if (txType.equals(TransactionAttributeType.NEVER))
       {
          // make sure we use the EJB3 interceptor, not the AOP one. 
@@ -118,9 +118,14 @@
       {
          return new TxInterceptor.Mandatory(TxUtil.getTransactionManager(), policy, timeout);
       }
+      else if(txType.equals(TransactionAttributeType.SUPPORTS))
+      {
+         return new TxInterceptor.Supports(TxUtil.getTransactionManager(), policy, timeout);
+      }
       else
       {
-         return super.createPerJoinpoint(advisor, jp);
+         Object interceptor = super.createPerJoinpoint(advisor, jp);
+         return interceptor;
       }
    }