You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2007/03/30 20:18:35 UTC

svn commit: r524218 - in /incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp: CmpContainer.java cmp2/Cmp2Generator.java

Author: dain
Date: Fri Mar 30 11:18:34 2007
New Revision: 524218

URL: http://svn.apache.org/viewvc?view=rev&rev=524218
Log:
Using reflection to get the value of the deleted field doen't work due to JPA enhancement so add a method to get the field

Modified:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java?view=diff&rev=524218&r1=524217&r2=524218
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java Fri Mar 30 11:18:34 2007
@@ -29,7 +29,6 @@
 import java.util.Map;
 import java.util.Vector;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.ArrayList;
 import javax.ejb.CreateException;
 import javax.ejb.EJBException;
@@ -406,8 +405,8 @@
 
     private boolean isDeleted(EntityBean entityBean) {
         try {
-            return entityBean.getClass().getField("deleted").getBoolean(entityBean);
-        } catch (NoSuchFieldException e) {
+            return (Boolean)entityBean.getClass().getMethod("OpenEJB_isDeleted").invoke(entityBean);
+        } catch (NoSuchMethodException e) {
             return false;
         } catch (Exception e) {
             throw new EJBException(e);
@@ -815,6 +814,9 @@
         try {
             CmpEngine cmpEngine = getCmpEngine(deploymentInfo);
             EntityBean entityBean = (EntityBean) cmpEngine.loadBean(callContext, callContext.getPrimaryKey());
+            if (entityBean == null) {
+                throw new ObjectNotFoundException(callContext.getDeploymentInfo().getDeploymentID() + " " + callContext.getPrimaryKey());
+            }
             ejbRemove(entityBean);
             cmpEngine.removeBean(callContext);
             cancelTimers(callContext);

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java?view=diff&rev=524218&r1=524217&r2=524218
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java Fri Mar 30 11:18:34 2007
@@ -148,6 +148,8 @@
 
         createSimplePrimaryKeyGetter();
 
+        createOpenEJB_isDeleted();
+
         createOpenEJB_deleted();
 
         createOpenEJB_addCmr();
@@ -174,6 +176,16 @@
         }
 
         mv.visitInsn(RETURN);
+        mv.visitMaxs(0, 0);
+        mv.visitEnd();
+    }
+
+    private void createOpenEJB_isDeleted() {
+        MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "OpenEJB_isDeleted", "()Z", null, null);
+        mv.visitCode();
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitFieldInsn(GETFIELD, implClassName, "deleted", "Z");
+        mv.visitInsn(IRETURN);
         mv.visitMaxs(0, 0);
         mv.visitEnd();
     }