Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@495684 13f79535-47bb-0310-9956-ffa450edef68

This commit is contained in:
A. Abram White 2007-01-12 18:50:53 +00:00
parent 3dd1c43165
commit 430d90f05f
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
View File

@ -1536,7 +1536,7 @@ public class PCEnhancer {
field = Reflection.findField(oidType, name, true); field = Reflection.findField(oidType, name, true);
reflect = !Modifier.isPublic(field.getModifiers()); reflect = !Modifier.isPublic(field.getModifiers());
if (reflect) { if (reflect) {
code.constant().setValue(oidType); code.classconstant().setClass(oidType);
code.constant().setValue(name); code.constant().setValue(name);
code.constant().setValue(true); code.constant().setValue(true);
code.invokestatic().setMethod(Reflection.class, code.invokestatic().setMethod(Reflection.class,
@ -1548,9 +1548,9 @@ public class PCEnhancer {
setter = Reflection.findSetter(oidType, name, type, true); setter = Reflection.findSetter(oidType, name, type, true);
reflect = !Modifier.isPublic(setter.getModifiers()); reflect = !Modifier.isPublic(setter.getModifiers());
if (reflect) { if (reflect) {
code.constant().setValue(oidType); code.classconstant().setClass(oidType);
code.constant().setValue(name); code.constant().setValue(name);
setClassConstant(_pc, code, type); code.classconstant().setClass(type);
code.constant().setValue(true); code.constant().setValue(true);
code.invokestatic().setMethod(Reflection.class, code.invokestatic().setMethod(Reflection.class,
"findSetter", Method.class, new Class[] { Class.class, "findSetter", Method.class, new Class[] { Class.class,
@ -1600,18 +1600,6 @@ public class PCEnhancer {
code.calculateMaxLocals(); code.calculateMaxLocals();
} }
/**
* Works around a bug in serp with primitive type constants, and chooses
* Java 5 construct when available (serp will eventually do all this
* automatically).
*/
private static void setClassConstant(BCClass bc, Code code, Class type) {
if (type.isPrimitive() || bc.getMajorVersion() < 49) // 49 = Java 5
code.classconstant().setClass(type);
else
code.constant().setValue(type);
}
/** /**
* Add code to extract the id of the given primary key relation field for * Add code to extract the id of the given primary key relation field for
* setting into an objectid instance. * setting into an objectid instance.
@ -1881,7 +1869,7 @@ public class PCEnhancer {
code.getfield().setField(field); code.getfield().setField(field);
else { else {
// Reflection.getXXX(oid, Reflection.findField(...)); // Reflection.getXXX(oid, Reflection.findField(...));
code.constant().setValue(oidType); code.classconstant().setClass(oidType);
code.constant().setValue(name); code.constant().setValue(name);
code.constant().setValue(true); code.constant().setValue(true);
code.invokestatic().setMethod(Reflection.class, code.invokestatic().setMethod(Reflection.class,
@ -1898,7 +1886,7 @@ public class PCEnhancer {
code.invokevirtual().setMethod(getter); code.invokevirtual().setMethod(getter);
else { else {
// Reflection.getXXX(oid, Reflection.findGetter(...)); // Reflection.getXXX(oid, Reflection.findGetter(...));
code.constant().setValue(oidType); code.classconstant().setClass(oidType);
code.constant().setValue(name); code.constant().setValue(name);
code.constant().setValue(true); code.constant().setValue(true);
code.invokestatic().setMethod(Reflection.class, code.invokestatic().setMethod(Reflection.class,