Apache/openjpa
1
0
Fork 0
mirror of https://github.com/apache/openjpa.git synced 2025-02-22 10:07:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2822 get rid of tricks < java8

Browse Source 
we can now rely on transform() being available on all JVMs.
This commit is contained in:
Mark Struberg 2020-07-23 14:00:10 +02:00
parent 5d9c88d7cb
commit bf03bdb314
2 changed files with 12 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ClassRedefiner.java
View File

@ -18,10 +18,8 @@
*/ */
package org.apache.openjpa.enhance; package org.apache.openjpa.enhance;
import java.lang.instrument.ClassDefinition;
import java.lang.instrument.ClassFileTransformer; import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.Instrumentation; import java.lang.instrument.Instrumentation;
import java.lang.reflect.Method;
import java.security.ProtectionDomain; import java.security.ProtectionDomain;
import java.util.Map; import java.util.Map;
@ -47,7 +45,7 @@ public class ClassRedefiner {
/** /**
* For each element in <code>classes</code>, this method will redefine * For each element in <code>classes</code>, this method will redefine
* all the element's methods such that field accesses are intercepted * all the element's methods such that field accesses are intercepted
* in-line. If {@link #canRedefineClasses()} returns <code>false</code>, * in-line. If {@link #canRedefineClasses(Log)} returns <code>false</code>,
* this method is a no-op. * this method is a no-op.
*/ */
public static void redefineClasses(OpenJPAConfiguration conf, public static void redefineClasses(OpenJPAConfiguration conf,
@ -62,37 +60,19 @@ public class ClassRedefiner {
inst = InstrumentationFactory.getInstrumentation(log); inst = InstrumentationFactory.getInstrumentation(log);
Class<?>[] array = classes.keySet().toArray(new Class[classes.size()]); Class<?>[] array = classes.keySet().toArray(new Class[classes.size()]);
if (JavaVersions.VERSION >= 6) { log.trace(_loc.get("retransform-types", classes.keySet()));
log.trace(_loc.get("retransform-types", classes.keySet()));
t = new ClassFileTransformer() { t = new ClassFileTransformer() {
@Override @Override
public byte[] transform(ClassLoader loader, String clsName, public byte[] transform(ClassLoader loader, String clsName,
Class<?> classBeingRedefined, ProtectionDomain pd, Class<?> classBeingRedefined, ProtectionDomain pd,
byte[] classfileBuffer) { byte[] classfileBuffer) {
return classes.get(classBeingRedefined); return classes.get(classBeingRedefined);
} }
}; };
// these are Java 6 methods, and we don't have a Java 6 build inst.addTransformer(t, true);
// module yet. The cost of reflection here is negligible inst.retransformClasses(array);
// compared to the redefinition / enhancement costs in total,
// so this should not be a big problem.
Method meth = inst.getClass().getMethod("addTransformer",
new Class[] { ClassFileTransformer.class, boolean.class });
meth.invoke(inst, new Object[] { t, true });
meth = inst.getClass().getMethod("retransformClasses",
new Class[] { array.getClass() });
meth.invoke(inst, new Object[] { array });
} else {
log.trace(_loc.get("redefine-types", classes.keySet()));
// in a Java 5 context, we can use class redefinition instead
ClassDefinition[] defs = new ClassDefinition[array.length];
for (int i = 0; i < defs.length; i++)
defs[i] = new ClassDefinition(array[i],
classes.get(array[i]));
inst.redefineClasses(defs);
}
} catch (Exception e) { } catch (Exception e) {
throw new InternalException(e); throw new InternalException(e);
} finally { } finally {

9
openjpa-kernel/src/main/java/org/apache/openjpa/enhance/InstrumentationFactory.java
View File

@ -40,7 +40,6 @@ import java.util.zip.ZipOutputStream;
import org.apache.openjpa.lib.log.Log; import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.lib.util.JavaVendors; import org.apache.openjpa.lib.util.JavaVendors;
import org.apache.openjpa.lib.util.JavaVersions;
import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.util.Localizer;
@ -89,14 +88,6 @@ public class InstrumentationFactory {
if ( _inst != null || !_dynamicallyInstall) if ( _inst != null || !_dynamicallyInstall)
return _inst; return _inst;
// dynamic loading of the agent is only available in JDK 1.6+
if (JavaVersions.VERSION < 6) {
if (log.isTraceEnabled() == true) {
log.trace(_name + ".getInstrumentation() Dynamic loading only supported on Java SE 6 or later");
}
return null;
}
AccessController.doPrivileged(new PrivilegedAction<Object>() { AccessController.doPrivileged(new PrivilegedAction<Object>() {
@Override @Override
public Object run() { public Object run() {