You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by aw...@apache.org on 2007/04/24 20:43:44 UTC
svn commit: r532039 -
/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java
Author: awhite
Date: Tue Apr 24 11:43:43 2007
New Revision: 532039
URL: http://svn.apache.org/viewvc?view=rev&rev=532039
Log:
Fix bytecode generation to use new FetchConfiguration.requiresFetch signature.
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java?view=diff&rev=532039&r1=532038&r2=532039
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java Tue Apr 24 11:43:43 2007
@@ -555,7 +555,7 @@
addLoadIntermediate(code, i, objectCount, jumps2, inter);
jumps2.add(code.go2());
- // if (fetch.requiresFetch(fmds[i]))
+ // if (fetch.requiresFetch(fmds[i])!=FetchConfiguration.FETCH_NONE)
setTarget(code.aload().setParam(1), jumps);
code.aload().setParam(0);
code.invokeinterface().setMethod(OpenJPAStateManager.class,
@@ -564,9 +564,9 @@
code.invokevirtual().setMethod(ClassMetaData.class,
"getField", FieldMetaData.class, new Class[]{int.class});
code.invokeinterface().setMethod (FetchConfiguration.class,
- "requiresFetch", boolean.class,
- new Class[]{FieldMetaData.class});
- jumps2.add(code.ifeq());
+ "requiresFetch", int.class, new Class[]{FieldMetaData.class});
+ code.constant().setValue(FetchConfiguration.FETCH_NONE);
+ jumps2.add(code.ificmpeq());
addLoad(bc, code, fmds[i], objectCount, local, false);
jumps = jumps2;