[openejb-scm] openejb/modules/core/src/java/org/openejb/assembler DeploymentInfoTxPolicySource.java

[dain]

dain        2005/02/15 19:09:23

  Modified:    modules/core/src/java/org/openejb/assembler
                        DeploymentInfoTxPolicySource.java
  Log:

  Fixed problem with CMT transactions throwing RolledbackException when an 
instance calls setRollbackOnly()
  Cleaned up handling of UnspecifiedTransactionContext
  Fixed inconsistencies in ContainerPolicy
  Removed the redundant stateful BMT policy
  
  Revision  Changes    Path
  1.6       +2 -3      
openejb/modules/core/src/java/org/openejb/assembler/DeploymentInfoTxPolicySource.java
  
  Index: DeploymentInfoTxPolicySource.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/assembler/DeploymentInfoTxPolicySource.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DeploymentInfoTxPolicySource.java 28 Oct 2004 21:21:26 -0000      1.5
  +++ DeploymentInfoTxPolicySource.java 16 Feb 2005 00:09:23 -0000      1.6
  @@ -48,7 +48,6 @@
   import java.util.HashMap;

   import java.util.Map;

   

  -import org.openejb.EJBComponentType;

   import org.openejb.dispatch.InterfaceMethodSignature;

   import org.openejb.transaction.BeanPolicy;

   import org.openejb.transaction.ContainerPolicy;

  @@ -103,7 +102,7 @@
               case CoreDeploymentInfo.TX_REQUIRED: return 
ContainerPolicy.Required;

               case CoreDeploymentInfo.TX_REQUIRES_NEW: return 
ContainerPolicy.RequiresNew;

               case CoreDeploymentInfo.TX_SUPPORTS: return 
ContainerPolicy.Supports;

  -            default: return (deployment.getComponentType() == 
EJBComponentType.STATELESS)?BeanPolicy.Stateless:BeanPolicy.Stateful;

  +            default: return BeanPolicy.INSTANCE;

           }

       }