[cvs] openejb/src/facilities/org/openejb/alt/containers/castor_cmp11 CastorCMP11_EntityContainer.java

Modified:    src/facilities/org/openejb/alt/containers/castor_cmp11 Tag:
                      v0_9 CastorCMP11_EntityContainer.java
Log:


  Adding Jacek's ejbRemove patch to the 0.9 branch so it can be released with
  OpenEJB 0.9.2 (whenever that happens)



By David Blevins, on 0103/02/12 09:14:15



Revision  Changes    Path
No                   revision


No                   revision


1.16.2.1  +5 -7      
openejb/src/facilities/org/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java

Index: CastorCMP11_EntityContainer.java
===================================================================
RCS file: 
/cvsroot/openejb/openejb/src/facilities/org/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- CastorCMP11_EntityContainer.java    17 Nov 2002 00:13:57 -0000      1.16
+++ CastorCMP11_EntityContainer.java    12 Feb 2003 17:14:14 -0000      1.16.2.1
@@ -40,7 +40,7 @@
  *
  * Copyright 1999 (C) Exoffice Technologies Inc. All Rights Reserved.
  *
- * $Id: CastorCMP11_EntityContainer.java,v 1.16 2002/11/17 00:13:57 dblevins 
Exp $
+ * $Id: CastorCMP11_EntityContainer.java,v 1.16.2.1 2003/02/12 17:14:14 
dblevins Exp $
  */
 package org.openejb.alt.containers.castor_cmp11;
 
@@ -94,7 +94,7 @@
  * 
  * @author <a href="mailto:Richard@xxxxxxxxxxxxxxxxx";>Richard Monson-Haefel</a>
  * @author <a href="mailto:david.blevins@xxxxxxxx";>David Blevins</a>
- * @version $Revision: 1.16 $ $Date: 2002/11/17 00:13:57 $
+ * @version $Revision: 1.16.2.1 $ $Date: 2003/02/12 17:14:14 $
  */
 public class CastorCMP11_EntityContainer 
        implements org.openejb.RpcContainer, 
@@ -1182,7 +1182,9 @@
         txPolicy.beforeInvoke( bean, txContext );
 
         try {
-            if ( OpenEJB.getTransactionManager().getStatus() == 
Status.STATUS_ACTIVE ) {
+            int status = OpenEJB.getTransactionManager().getStatus();
+            // are the other statuses possible here ?
+            if ( status == Status.STATUS_ACTIVE || status == 
Status.STATUS_NO_TRANSACTION ) {
 
                 /*  
                   Get the JDO database for this deployment
@@ -1200,11 +1202,7 @@
                 EJB_REMOVE_METHOD.invoke(bean, null);
 
                 db.remove(bean);
-
-            } else if ( OpenEJB.getTransactionManager().getStatus() == 
Status.STATUS_NO_TRANSACTION ) {
-                // DMB: Strange use of else if, there is no code!?
             }
-        
         } catch ( java.lang.reflect.InvocationTargetException ite ) {
             // handle enterprise bean exceptions
             if ( ite.getTargetException() instanceof RuntimeException ) {





-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
http://OpenEJB.sf.net
OpenEJB-development mailing list
OpenEJB-development@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/openejb-development