You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/01/07 10:42:39 UTC
svn commit: r896822 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
Author: dblevins
Date: Thu Jan 7 09:42:01 2010
New Revision: 896822
URL: http://svn.apache.org/viewvc?rev=896822&view=rev
Log:
OPENEJB-1116: CMP2 EntityBean conflict when a persistent property exists called "deleted"
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java?rev=896822&r1=896821&r2=896822&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java Thu Jan 7 09:42:01 2010
@@ -55,6 +55,7 @@
private final List<Method> selectMethods = new ArrayList<Method>();
private final Class beanClass;
private final PostCreateGenerator postCreateGenerator;
+ private static final String DELETED = "openejb_deleted";
/**
* Constructor for a Cmp2Generator. This validates the
@@ -192,7 +193,7 @@
// private transient boolean deleted;
{
- FieldVisitor fv = cw.visitField(ACC_PRIVATE + ACC_TRANSIENT, "deleted", "Z", null, null);
+ FieldVisitor fv = cw.visitField(ACC_PRIVATE + ACC_TRANSIENT, DELETED, "Z", null, null);
fv.visitEnd();
}
@@ -298,7 +299,7 @@
MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "OpenEJB_isDeleted", "()Z", null, null);
mv.visitCode();
mv.visitVarInsn(ALOAD, 0);
- mv.visitFieldInsn(GETFIELD, implClassName, "deleted", "Z");
+ mv.visitFieldInsn(GETFIELD, implClassName, DELETED, "Z");
mv.visitInsn(IRETURN);
mv.visitMaxs(0, 0);
mv.visitEnd();
@@ -310,7 +311,7 @@
/* if (deleted) return; */
mv.visitVarInsn(ALOAD, 0);
- mv.visitFieldInsn(GETFIELD, implClassName, "deleted", "Z");
+ mv.visitFieldInsn(GETFIELD, implClassName, DELETED, "Z");
Label notDeleted = new Label();
mv.visitJumpInsn(IFEQ, notDeleted);
mv.visitInsn(RETURN);
@@ -319,7 +320,7 @@
// deleted = true;
mv.visitVarInsn(ALOAD, 0);
mv.visitInsn(ICONST_1);
- mv.visitFieldInsn(PUTFIELD, implClassName, "deleted", "Z");
+ mv.visitFieldInsn(PUTFIELD, implClassName, DELETED, "Z");
for (CmrField cmrField : cmrFields) {
// ${cmrField.accessor}.delete(${cmrField.name});
@@ -338,7 +339,7 @@
// if (deleted) return null;
mv.visitVarInsn(ALOAD, 0);
- mv.visitFieldInsn(GETFIELD, implClassName, "deleted", "Z");
+ mv.visitFieldInsn(GETFIELD, implClassName, DELETED, "Z");
Label notDeleted = new Label();
mv.visitJumpInsn(IFEQ, notDeleted);
mv.visitInsn(ACONST_NULL);
@@ -391,7 +392,7 @@
// if (deleted) return;
mv.visitVarInsn(ALOAD, 0);
- mv.visitFieldInsn(GETFIELD, implClassName, "deleted", "Z");
+ mv.visitFieldInsn(GETFIELD, implClassName, DELETED, "Z");
Label notDeleted = new Label();
mv.visitJumpInsn(IFEQ, notDeleted);
mv.visitInsn(RETURN);