Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AccessClassLoader - short-circuit class lookups for access classes th… #51

Closed
wants to merge 2 commits into from
Closed

AccessClassLoader - short-circuit class lookups for access classes th… #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b15206
AccessClassLoader - short-circuit class lookups for access classes th…
Sep 28, 2016
3ee127b
AccessClassLoader.mvn - release to org.db4j groupId
Dec 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.esotericsoftware</groupId>
<groupId>org.db4j</groupId>
<artifactId>reflectasm</artifactId>
<version>1.11.5-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ReflectASM</name>
<description>High performance Java reflection using code generation</description>
<url>https://github.com/EsotericSoftware/reflectasm</url>
<url>https://github.com/nqzero/reflectasm</url>

<licenses>
<license>
Expand All @@ -23,8 +23,8 @@

<scm>
<url>https://github.com/EsotericSoftware/reflectasm</url>
<connection>scm:git:[email protected]:EsotericSoftware/reflectasm.git</connection>
<developerConnection>scm:git:[email protected]:EsotericSoftware/reflectasm.git</developerConnection>
<connection>scm:git:[email protected]:nqzero/reflectasm.git</connection>
<developerConnection>scm:git:[email protected]:nqzero/reflectasm.git</developerConnection>
</scm>

<developers>
Expand All @@ -33,6 +33,12 @@
<name>Nathan Sweet</name>
<email>[email protected]</email>
</developer>
<developer>
<name>nqzero</name>
<email>[email protected]</email>
<organization>nqzero</organization>
<organizationUrl>https://github.com/nqzero</organizationUrl>
</developer>
</developers>

<properties>
Expand Down
14 changes: 14 additions & 0 deletions src/com/esotericsoftware/reflectasm/AccessClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
import java.security.ProtectionDomain;
import java.util.HashSet;
import java.util.WeakHashMap;

class AccessClassLoader extends ClassLoader {
Expand Down Expand Up @@ -82,6 +83,19 @@ private AccessClassLoader (ClassLoader parent) {
super(parent);
}

HashSet<String> locals = new HashSet<String>();
java.lang.Class<?> loadClassLocal(String name) throws ClassNotFoundException {
if (locals.contains(name))
return loadClass(name,false);
else
throw new ClassNotFoundException();
}
Class<?> defineClassLocal(String name, byte[] bytes) throws ClassFormatError {
locals.add(name);
return defineClass(name,bytes);
}


protected java.lang.Class<?> loadClass (String name, boolean resolve) throws ClassNotFoundException {
// These classes come from the classloader that loaded AccessClassLoader.
if (name.equals(FieldAccess.class.getName())) return FieldAccess.class;
Expand Down
6 changes: 3 additions & 3 deletions src/com/esotericsoftware/reflectasm/ConstructorAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ static public <T> ConstructorAccess<T> get (Class<T> type) {

AccessClassLoader loader = AccessClassLoader.get(type);
try {
accessClass = loader.loadClass(accessClassName);
accessClass = loader.loadClassLocal(accessClassName);
} catch (ClassNotFoundException ignored) {
synchronized (loader) {
try {
accessClass = loader.loadClass(accessClassName);
accessClass = loader.loadClassLocal(accessClassName);
} catch (ClassNotFoundException ignored2) {
String accessClassNameInternal = accessClassName.replace('.', '/');
String classNameInternal = className.replace('.', '/');
Expand Down Expand Up @@ -100,7 +100,7 @@ static public <T> ConstructorAccess<T> get (Class<T> type) {
insertNewInstanceInner(cw, classNameInternal, enclosingClassNameInternal);

cw.visitEnd();
accessClass = loader.defineClass(accessClassName, cw.toByteArray());
accessClass = loader.defineClassLocal(accessClassName, cw.toByteArray());
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/com/esotericsoftware/reflectasm/FieldAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,11 @@ static public FieldAccess get (Class type) {

AccessClassLoader loader = AccessClassLoader.get(type);
try {
accessClass = loader.loadClass(accessClassName);
accessClass = loader.loadClassLocal(accessClassName);
} catch (ClassNotFoundException ignored) {
synchronized (loader) {
try {
accessClass = loader.loadClass(accessClassName);
accessClass = loader.loadClassLocal(accessClassName);
} catch (ClassNotFoundException ignored2) {
String accessClassNameInternal = accessClassName.replace('.', '/');
String classNameInternal = className.replace('.', '/');
Expand Down Expand Up @@ -170,7 +170,7 @@ static public FieldAccess get (Class type) {
insertSetPrimitive(cw, classNameInternal, fields, Type.CHAR_TYPE);
insertGetString(cw, classNameInternal, fields);
cw.visitEnd();
accessClass = loader.defineClass(accessClassName, cw.toByteArray());
accessClass = loader.defineClassLocal(accessClassName, cw.toByteArray());
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/com/esotericsoftware/reflectasm/MethodAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ static public MethodAccess get (Class type) {

AccessClassLoader loader = AccessClassLoader.get(type);
try {
accessClass = loader.loadClass(accessClassName);
accessClass = loader.loadClassLocal(accessClassName);
} catch (ClassNotFoundException ignored) {
synchronized (loader) {
try {
accessClass = loader.loadClass(accessClassName);
accessClass = loader.loadClassLocal(accessClassName);
} catch (ClassNotFoundException ignored2) {
String accessClassNameInternal = accessClassName.replace('.', '/');
String classNameInternal = className.replace('.', '/');
Expand Down Expand Up @@ -272,7 +272,7 @@ else if (Modifier.isStatic(methods.get(i).getModifiers()))
}
cw.visitEnd();
byte[] data = cw.toByteArray();
accessClass = loader.defineClass(accessClassName, data);
accessClass = loader.defineClassLocal(accessClassName, data);
}
}
}
Expand Down