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

OPENJPA-2911 code cleanup for InterfaceImplGenerator

This commit is contained in:
Mark Struberg 2023-07-19 18:55:53 +02:00
parent bc63865aac
commit b04c985956
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java
View File

@ -81,16 +81,13 @@ class InterfaceImplGenerator {
// distinct temp project / loader for enhancing // distinct temp project / loader for enhancing
EnhancementProject _enhProject = new EnhancementProject(); EnhancementProject _enhProject = new EnhancementProject();
ClassLoader parentLoader = AccessController.doPrivileged( ClassLoader parentLoader = AccessController.doPrivileged(J2DoPrivHelper.getClassLoaderAction(iface));
J2DoPrivHelper.getClassLoaderAction(iface));
EnhancementClassLoader loader = new EnhancementClassLoader(_project, parentLoader); EnhancementClassLoader loader = new EnhancementClassLoader(_project, parentLoader);
EnhancementClassLoader enhLoader = new EnhancementClassLoader(_enhProject, parentLoader);
ClassNodeTracker bc = _project.loadClass(getClassName(meta), loader); ClassNodeTracker bc = _project.loadClass(getClassName(meta), loader);
bc.declareInterface(iface); bc.declareInterface(iface);
ClassMetaData sup = meta.getPCSuperclassMetaData(); ClassMetaData sup = meta.getPCSuperclassMetaData();
if (sup != null) { if (sup != null) {
bc.getClassNode().superName = Type.getInternalName(sup.getInterfaceImpl()); bc.getClassNode().superName = Type.getInternalName(sup.getInterfaceImpl());
enhLoader = new EnhancementClassLoader(_enhProject, sup.getInterfaceImpl().getClassLoader());
} }
FieldMetaData[] fields = meta.getDeclaredFields(); FieldMetaData[] fields = meta.getDeclaredFields();
@ -123,7 +120,9 @@ class InterfaceImplGenerator {
EnhancementProject finalProject = new EnhancementProject(); EnhancementProject finalProject = new EnhancementProject();
EnhancementClassLoader finalLoader = new EnhancementClassLoader(finalProject, parentLoader); EnhancementClassLoader finalLoader = new EnhancementClassLoader(finalProject, parentLoader);
final byte[] classBytes2 = AsmHelper.toByteArray(enhancer.getPCBytecode()); final byte[] classBytes2 = AsmHelper.toByteArray(enhancer.getPCBytecode());
ClassNodeTracker bcEnh2 = finalProject.loadClass(classBytes2, finalLoader);
// this is just to make the ClassLoader aware of the bytecode for the enhanced class
finalProject.loadClass(classBytes2, finalLoader);
String pcClassName = enhancer.getPCBytecode().getClassNode().name.replace("/", "."); String pcClassName = enhancer.getPCBytecode().getClassNode().name.replace("/", ".");
impl = Class.forName(pcClassName, true, finalLoader); impl = Class.forName(pcClassName, true, finalLoader);