开源软件构建与测试

_service:tar_scm:reflectasm.spec Changed

_service:tar_scm:fix-compilation-fails.patch Changed

@@ -10,11 +10,11 @@
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/com/esotericsoftware/reflectasm/ConstructorAccess.java b/src/com/esotericsoftware/reflectasm/ConstructorAccess.java
-index eafbab1..3eb1da2 100644
+index 8cda997..9d5edbf 100644
 --- a/src/com/esotericsoftware/reflectasm/ConstructorAccess.java
 +++ b/src/com/esotericsoftware/reflectasm/ConstructorAccess.java
-@@ -90,7 +90,7 @@ public abstract class ConstructorAccess<T> {
- 												"com/esotericsoftware/reflectasm/ConstructorAccess";
+@@ -89,7 +89,7 @@ abstract public class ConstructorAccess<T> {
+ 					: "com/esotericsoftware/reflectasm/ConstructorAccess";
  
  				ClassWriter cw = new ClassWriter(0);
 -				cw.visit(V1_1, ACC_PUBLIC + ACC_SUPER, accessClassNameInternal, null, superclassNameInternal, null);
@@ -23,10 +23,10 @@
  				insertConstructor(cw, superclassNameInternal);
  				insertNewInstance(cw, classNameInternal);
 diff --git a/src/com/esotericsoftware/reflectasm/FieldAccess.java b/src/com/esotericsoftware/reflectasm/FieldAccess.java
-index 075ba9a..ab7878f 100644
+index acc9ce6..e6c3953 100644
 --- a/src/com/esotericsoftware/reflectasm/FieldAccess.java
 +++ b/src/com/esotericsoftware/reflectasm/FieldAccess.java
-@@ -129,7 +129,7 @@ public abstract class FieldAccess {
+@@ -147,7 +147,7 @@ public abstract class FieldAccess {
  				String classNameInternal = className.replace('.', '/');
  
  				ClassWriter cw = new ClassWriter(0);
@@ -36,10 +36,10 @@
  				insertConstructor(cw);
  				insertGetObject(cw, classNameInternal, fields);
 diff --git a/src/com/esotericsoftware/reflectasm/MethodAccess.java b/src/com/esotericsoftware/reflectasm/MethodAccess.java
-index 983439f..3cc3393 100644
+index bd6456f..18a18b3 100644
 --- a/src/com/esotericsoftware/reflectasm/MethodAccess.java
 +++ b/src/com/esotericsoftware/reflectasm/MethodAccess.java
-@@ -116,7 +116,7 @@ public abstract class MethodAccess {
+@@ -120,7 +120,7 @@ public abstract class MethodAccess {
  
  				ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
  				MethodVisitor mv;

_service Changed

_service:tar_scm:reflectasm-1.11.0.tar.gz/lib/asm-4.0.jar Deleted

_service:tar_scm:reflectasm-1.11.0.tar.gz/.classpath -> _service:tar_scm:reflectasm-1.11.9.tar.gz/.classpath Changed

_service:tar_scm:reflectasm-1.11.9.tar.gz/.settings Added

_service:tar_scm:reflectasm-1.11.9.tar.gz/.settings/org.eclipse.jdt.core.prefs Added

_service:tar_scm:reflectasm-1.11.9.tar.gz/.travis.yml Added

_service:tar_scm:reflectasm-1.11.9.tar.gz/CONTRIBUTING.md Added

_service:tar_scm:reflectasm-1.11.0.tar.gz/README.md -> _service:tar_scm:reflectasm-1.11.9.tar.gz/README.md Changed

@@ -1,5 +1,8 @@
 !(https://raw.github.com/wiki/EsotericSoftware/reflectasm/images/logo.png)
 
+!Build Status(https://travis-ci.org/EsotericSoftware/reflectasm.png?branch=master)(https://travis-ci.org/EsotericSoftware/reflectasm)
+!Maven Central(https://maven-badges.herokuapp.com/maven-central/com.esotericsoftware/reflectasm/badge.svg)(http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.esotericsoftware%22%20AND%20a%3Areflectasm)
+
 Please use the ReflectASM discussion group(http://groups.google.com/group/reflectasm-users) for support.
 
 ## Overview
@@ -24,27 +27,10 @@
     <dependency>
         <groupId>com.esotericsoftware</groupId>
         <artifactId>reflectasm</artifactId>
-        <version>1.10.1</version>
+        <version>1.11.7</version>
     </dependency>
 ```
 
-If you already have asm in a different version (than the one pulled in by reflectasm - see pom.xml) in your classpath, you should use the shaded reflectasm (contains relocated asm classes):
-
-```xml
-<dependency>
-  <groupId>com.esotericsoftware</groupId>
-  <artifactId>reflectasm</artifactId>
-  <version>1.10.1</version>
-  <classifier>shaded</classifier>
-  <exclusions>
-    <exclusion>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-    </exclusion>
-  </exclusions>
-</dependency>
-```
-
 ## Usage
 
 Method reflection with ReflectASM:

_service:tar_scm:reflectasm-1.11.9.tar.gz/lib/asm-5.1.jar Added

_service:tar_scm:reflectasm-1.11.0.tar.gz/pom.xml -> _service:tar_scm:reflectasm-1.11.9.tar.gz/pom.xml Changed

@@ -7,7 +7,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.esotericsoftware</groupId>
 	<artifactId>reflectasm</artifactId>
-	<version>1.11.0</version>
+	<version>1.11.9</version>
 	<packaging>bundle</packaging>
 	<name>ReflectASM</name>
 	<description>High performance Java reflection using code generation</description>
@@ -15,8 +15,8 @@
 
 	<licenses>
 		<license>
-			<name>New BSD License</name>
-			<url>http://www.opensource.org/licenses/bsd-license.php</url>
+			<name>3-Clause BSD License</name>
+			<url>https://opensource.org/licenses/BSD-3-Clause</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm</artifactId>
-			<version>5.0.3</version>
+			<version>5.1</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -88,9 +88,11 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>2.4</version>
 				<configuration>
-					<excludes>
-						<exclude>**/.svn/*</exclude>
-					</excludes>
+					<archive>
+						<manifestEntries>
+							<Automatic-Module-Name>com.esotericsoftware.reflectasm</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -106,12 +108,11 @@
 						<configuration>
 							
 							<minimizeJar>true</minimizeJar>
-							<shadedArtifactAttached>true</shadedArtifactAttached>
-							<shadedClassifierName>shaded</shadedClassifierName>
+							<shadedArtifactAttached>false</shadedArtifactAttached>
 							<relocations>
 								<relocation>
 									<pattern>org.objectweb.asm</pattern>
-									<shadedPattern>com.esotericsoftware.reflectasm.shaded.org.objectweb.asm</shadedPattern>
+									<shadedPattern>com.esotericsoftware.asm</shadedPattern>
 								</relocation>
 							</relocations>
 						</configuration>
@@ -126,6 +127,7 @@
 				<configuration>
 					<instructions>
 						<Export-Package>com.esotericsoftware.reflectasm*</Export-Package>
+						<Import-Package>!org.objectweb.asm.*</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>

_service:tar_scm:reflectasm-1.11.0.tar.gz/project.yaml -> _service:tar_scm:reflectasm-1.11.9.tar.gz/project.yaml Changed

_service:tar_scm:reflectasm-1.11.0.tar.gz/src/com/esotericsoftware/reflectasm/AccessClassLoader.java -> _service:tar_scm:reflectasm-1.11.9.tar.gz/src/com/esotericsoftware/reflectasm/AccessClassLoader.java Changed

@@ -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 {
@@ -29,60 +30,34 @@
 	// Fast-path for classes loaded in the same ClassLoader as this class.
 	static private final ClassLoader selfContextParentClassLoader = getParentClassLoader(AccessClassLoader.class);
 	static private volatile AccessClassLoader selfContextAccessClassLoader = new AccessClassLoader(selfContextParentClassLoader);
-	
+
 	static private volatile Method defineClassMethod;
 
-	static AccessClassLoader get (Class type) {
-		ClassLoader parent = getParentClassLoader(type);
-		// 1. fast-path:
-		if (selfContextParentClassLoader.equals(parent)) {
-			if (selfContextAccessClassLoader == null) {
-				synchronized (accessClassLoaders) { // DCL with volatile semantics
-					if (selfContextAccessClassLoader == null)
-						selfContextAccessClassLoader = new AccessClassLoader(selfContextParentClassLoader);
-				}
-			}
-			return selfContextAccessClassLoader;
-		}
-		// 2. normal search:
-		synchronized (accessClassLoaders) {
-			WeakReference<AccessClassLoader> ref = accessClassLoaders.get(parent);
-			if (ref != null) {
-				AccessClassLoader accessClassLoader = ref.get();
-				if (accessClassLoader != null)
-					return accessClassLoader;
-				else
-					accessClassLoaders.remove(parent); // the value has been GC-reclaimed, but still not the key (defensive sanity)
-			}
-			AccessClassLoader accessClassLoader = new AccessClassLoader(parent);
-			accessClassLoaders.put(parent, new WeakReference<AccessClassLoader>(accessClassLoader));
-			return accessClassLoader;
-		}
+	private final HashSet<String> localClassNames = new HashSet();
+
+	private AccessClassLoader (ClassLoader parent) {
+		super(parent);
 	}
 
-	public static void remove (ClassLoader parent) {
-		// 1. fast-path:
-		if (selfContextParentClassLoader.equals(parent)) {
-			selfContextAccessClassLoader = null;
-		} else {
-			// 2. normal search:
-			synchronized (accessClassLoaders) {
-				accessClassLoaders.remove(parent);
+	/** Returns null if the access class has not yet been defined. */
+	Class loadAccessClass (String name) {
+		// No need to check the parent class loader if the access class hasn't been defined yet.
+		if (localClassNames.contains(name)) {
+			try {
+				return loadClass(name, false);
+			} catch (ClassNotFoundException ex) {
+				throw new RuntimeException(ex); // Should not happen, since we know the class has been defined.
 			}
 		}
+		return null;
 	}
 
-	public static int activeAccessClassLoaders () {
-		int sz = accessClassLoaders.size();
-		if (selfContextAccessClassLoader != null) sz++;
-		return sz;
+	Class defineAccessClass (String name, byte bytes) throws ClassFormatError {
+		localClassNames.add(name);
+		return defineClass(name, bytes);
 	}
 
-	private AccessClassLoader (ClassLoader parent) {
-		super(parent);
-	}
-
-	protected synchronized java.lang.Class<?> loadClass (String name, boolean resolve) throws ClassNotFoundException {
+	protected 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;
 		if (name.equals(MethodAccess.class.getName())) return MethodAccess.class;
@@ -95,52 +70,96 @@
 	Class<?> defineClass (String name, byte bytes) throws ClassFormatError {
 		try {
 			// Attempt to load the access class in the same loader, which makes protected and default access members accessible.
-			return (Class<?>)getDefineClassMethod().invoke(getParent(), new Object {name, bytes, Integer.valueOf(0), Integer.valueOf(bytes.length),
-				getClass().getProtectionDomain()});
+			return (Class<?>)getDefineClassMethod().invoke(getParent(),
+				new Object {name, bytes, Integer.valueOf(0), Integer.valueOf(bytes.length), getClass().getProtectionDomain()});
 		} catch (Exception ignored) {
 			// continue with the definition in the current loader (won't have access to protected and package-protected members)
 		}
 		return defineClass(name, bytes, 0, bytes.length, getClass().getProtectionDomain());
 	}
-	
-	// As per JLS, section 5.3,
-	// "The runtime package of a class or interface is determined by the package name and defining class loader of the class or interface."
-	static boolean areInSameRuntimeClassLoader(Class type1, Class type2) {
 
-		if (type1.getPackage()!=type2.getPackage()) {
+	// As per JLS, section 5.3,
+	// "The runtime package of a class or interface is determined by the package name and defining class loader of the class or
+	// interface."
+	static boolean areInSameRuntimeClassLoader (Class type1, Class type2) {
+		if (type1.getPackage() != type2.getPackage()) {
 			return false;
 		}
 		ClassLoader loader1 = type1.getClassLoader();
 		ClassLoader loader2 = type2.getClassLoader();
 		ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
-		if (loader1==null) {
-			return (loader2==null || loader2==systemClassLoader);
-		}
-		if (loader2==null) {
-			return loader1==systemClassLoader;
+		if (loader1 == null) {
+			return (loader2 == null || loader2 == systemClassLoader);
 		}
-		return loader1==loader2;
+		if (loader2 == null) return loader1 == systemClassLoader;
+		return loader1 == loader2;
 	}
 
-	private static ClassLoader getParentClassLoader (Class type) {
+	static private ClassLoader getParentClassLoader (Class type) {
 		ClassLoader parent = type.getClassLoader();
 		if (parent == null) parent = ClassLoader.getSystemClassLoader();
 		return parent;
 	}
-	
-	private static Method getDefineClassMethod() throws Exception {
-		// DCL on volatile
-		if (defineClassMethod==null) {
-			synchronized(accessClassLoaders) {
-				defineClassMethod = ClassLoader.class.getDeclaredMethod("defineClass", new Class {String.class, byte.class, int.class,
-				int.class, ProtectionDomain.class});
-				try {
-					defineClassMethod.setAccessible(true);
-				}
-				catch (Exception ignored) {
+
+	static private Method getDefineClassMethod () throws Exception {
+		if (defineClassMethod == null) {
+			synchronized (accessClassLoaders) {
+				if (defineClassMethod == null) {
+					defineClassMethod = ClassLoader.class.getDeclaredMethod("defineClass",
+						new Class {String.class, byte.class, int.class, int.class, ProtectionDomain.class});
+					try {
+						defineClassMethod.setAccessible(true);
+					} catch (Exception ignored) {
+					}
 				}
 			}
 		}
 		return defineClassMethod;
 	}
+
+	static AccessClassLoader get (Class type) {
+		ClassLoader parent = getParentClassLoader(type);
+		// 1. fast-path:
+		if (selfContextParentClassLoader.equals(parent)) {
+			if (selfContextAccessClassLoader == null) {
+				synchronized (accessClassLoaders) { // DCL with volatile semantics
+					if (selfContextAccessClassLoader == null)
+						selfContextAccessClassLoader = new AccessClassLoader(selfContextParentClassLoader);
+				}
+			}
+			return selfContextAccessClassLoader;
+		}
+		// 2. normal search:
+		synchronized (accessClassLoaders) {
+			WeakReference<AccessClassLoader> ref = accessClassLoaders.get(parent);
+			if (ref != null) {
+				AccessClassLoader accessClassLoader = ref.get();
+				if (accessClassLoader != null)
+					return accessClassLoader;
+				else
+					accessClassLoaders.remove(parent); // the value has been GC-reclaimed, but still not the key (defensive sanity)
+			}
+			AccessClassLoader accessClassLoader = new AccessClassLoader(parent);
+			accessClassLoaders.put(parent, new WeakReference<AccessClassLoader>(accessClassLoader));
+			return accessClassLoader;
+		}
+	}
+
+	static public void remove (ClassLoader parent) {
+		// 1. fast-path:
+		if (selfContextParentClassLoader.equals(parent)) {
+			selfContextAccessClassLoader = null;
+		} else {
+			// 2. normal search:
+			synchronized (accessClassLoaders) {
+				accessClassLoaders.remove(parent);
+			}

_service:tar_scm:reflectasm-1.11.0.tar.gz/src/com/esotericsoftware/reflectasm/ConstructorAccess.java -> _service:tar_scm:reflectasm-1.11.9.tar.gz/src/com/esotericsoftware/reflectasm/ConstructorAccess.java Changed

@@ -22,7 +22,7 @@
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.MethodVisitor;
 
-public abstract class ConstructorAccess<T> {
+abstract public class ConstructorAccess<T> {
 	boolean isNonStaticMemberClass;
 
 	public boolean isNonStaticMemberClass () {
@@ -48,13 +48,12 @@
 		String className = type.getName();
 		String accessClassName = className + "ConstructorAccess";
 		if (accessClassName.startsWith("java.")) accessClassName = "reflectasm." + accessClassName;
+
 		Class accessClass;
-		
 		AccessClassLoader loader = AccessClassLoader.get(type);
 		synchronized (loader) {
-			try {
-				accessClass = loader.loadClass(accessClassName);
-			} catch (ClassNotFoundException ignored) {
+			accessClass = loader.loadAccessClass(accessClassName);
+			if (accessClass == null) {
 				String accessClassNameInternal = accessClassName.replace('.', '/');
 				String classNameInternal = className.replace('.', '/');
 				String enclosingClassNameInternal;
@@ -77,17 +76,17 @@
 						constructor = type.getDeclaredConstructor(enclosingType); // Inner classes should have this.
 						modifiers = constructor.getModifiers();
 					} catch (Exception ex) {
-						throw new RuntimeException("Non-static member class cannot be created (missing enclosing class constructor): "
-							+ type.getName(), ex);
+						throw new RuntimeException(
+							"Non-static member class cannot be created (missing enclosing class constructor): " + type.getName(), ex);
 					}
 					if (Modifier.isPrivate(modifiers)) {
 						throw new RuntimeException(
 							"Non-static member class cannot be created (the enclosing class constructor is private): " + type.getName());
 					}
 				}
-				String superclassNameInternal = Modifier.isPublic(modifiers) ?
-												"com/esotericsoftware/reflectasm/PublicConstructorAccess" :
-												"com/esotericsoftware/reflectasm/ConstructorAccess";
+				String superclassNameInternal = Modifier.isPublic(modifiers)
+					? "com/esotericsoftware/reflectasm/PublicConstructorAccess"
+					: "com/esotericsoftware/reflectasm/ConstructorAccess";
 
 				ClassWriter cw = new ClassWriter(0);
 				cw.visit(V1_1, ACC_PUBLIC + ACC_SUPER, accessClassNameInternal, null, superclassNameInternal, null);
@@ -97,7 +96,7 @@
 				insertNewInstanceInner(cw, classNameInternal, enclosingClassNameInternal);
 
 				cw.visitEnd();
-				accessClass = loader.defineClass(accessClassName, cw.toByteArray());
+				accessClass = loader.defineAccessClass(accessClassName, cw.toByteArray());
 			}
 		}
 		ConstructorAccess<T> access;
@@ -106,14 +105,13 @@
 		} catch (Throwable t) {
 			throw new RuntimeException("Exception constructing constructor access class: " + accessClassName, t);
 		}
-		if (!(access instanceof PublicConstructorAccess)  && !AccessClassLoader.areInSameRuntimeClassLoader(type, accessClass)) {
+		if (!(access instanceof PublicConstructorAccess) && !AccessClassLoader.areInSameRuntimeClassLoader(type, accessClass)) {
 			// Must test this after the try-catch block, whether the class has been loaded as if has been defined.
 			// Throw a Runtime exception here instead of an IllegalAccessError when invoking newInstance()
-			throw new RuntimeException(
-					(!isNonStaticMemberClass ?
-					"Class cannot be created (the no-arg constructor is protected or package-protected, and its ConstructorAccess could not be defined in the same class loader): " :
-					"Non-static member class cannot be created (the enclosing class constructor is protected or package-protected, and its ConstructorAccess could not be defined in the same class loader): ")
-					+ type.getName());
+			throw new RuntimeException((!isNonStaticMemberClass
+				? "Class cannot be created (the no-arg constructor is protected or package-protected, and its ConstructorAccess could not be defined in the same class loader): "
+				: "Non-static member class cannot be created (the enclosing class constructor is protected or package-protected, and its ConstructorAccess could not be defined in the same class loader): ")
+				+ type.getName());
 		}
 		access.isNonStaticMemberClass = isNonStaticMemberClass;
 		return access;

_service:tar_scm:reflectasm-1.11.0.tar.gz/src/com/esotericsoftware/reflectasm/FieldAccess.java -> _service:tar_scm:reflectasm-1.11.9.tar.gz/src/com/esotericsoftware/reflectasm/FieldAccess.java Changed

@@ -28,6 +28,7 @@
 public abstract class FieldAccess {
 	private String fieldNames;
 	private Class fieldTypes;
+	private Field fields;
 
 	public int getIndex (String fieldName) {
 		for (int i = 0, n = fieldNames.length; i < n; i++)
@@ -35,6 +36,12 @@
 		throw new IllegalArgumentException("Unable to find non-private field: " + fieldName);
 	}
 
+	public int getIndex (Field field) {
+		for (int i = 0, n = fields.length; i < n; i++)
+			if (fieldsi.equals(field)) return i;
+		throw new IllegalArgumentException("Unable to find non-private field: " + field);
+	}
+
 	public void set (Object instance, String fieldName, Object value) {
 		set(instance, getIndex(fieldName), value);
 	}
@@ -55,6 +62,14 @@
 		return fieldTypes.length;
 	}
 
+	public Field getFields () {
+		return fields;
+	}
+
+	public void setFields (Field fields) {
+		this.fields = fields;
+	}
+
 	abstract public void set (Object instance, int fieldIndex, Object value);
 
 	abstract public void setBoolean (Object instance, int fieldIndex, boolean value);
@@ -93,7 +108,11 @@
 
 	abstract public float getFloat (Object instance, int fieldIndex);
 
+	/** @param type Must not be the Object class, an interface, a primitive type, or void. */
 	static public FieldAccess get (Class type) {
+		if (type.getSuperclass() == null)
+			throw new IllegalArgumentException("The type must not be the Object class, an interface, a primitive type, or void.");
+
 		ArrayList<Field> fields = new ArrayList<Field>();
 		Class nextClass = type;
 		while (nextClass != Object.class) {
@@ -118,13 +137,12 @@
 		String className = type.getName();
 		String accessClassName = className + "FieldAccess";
 		if (accessClassName.startsWith("java.")) accessClassName = "reflectasm." + accessClassName;
-		Class accessClass = null;
 
+		Class accessClass;
 		AccessClassLoader loader = AccessClassLoader.get(type);
 		synchronized (loader) {
-			try {
-				accessClass = loader.loadClass(accessClassName);
-			} catch (ClassNotFoundException ignored) {
+			accessClass = loader.loadAccessClass(accessClassName);
+			if (accessClass == null) {
 				String accessClassNameInternal = accessClassName.replace('.', '/');
 				String classNameInternal = className.replace('.', '/');
 
@@ -152,13 +170,14 @@
 				insertSetPrimitive(cw, classNameInternal, fields, Type.CHAR_TYPE);
 				insertGetString(cw, classNameInternal, fields);
 				cw.visitEnd();
-				accessClass = loader.defineClass(accessClassName, cw.toByteArray());
+				accessClass = loader.defineAccessClass(accessClassName, cw.toByteArray());
 			}
 		}
 		try {
 			FieldAccess access = (FieldAccess)accessClass.newInstance();
 			access.fieldNames = fieldNames;
 			access.fieldTypes = fieldTypes;
+			access.fields = fields.toArray(new Fieldfields.size());
 			return access;
 		} catch (Throwable t) {
 			throw new RuntimeException("Error constructing field access class: " + accessClassName, t);
@@ -240,7 +259,8 @@
 					break;
 				}
 
-				mv.visitFieldInsn(PUTFIELD, classNameInternal, field.getName(), fieldType.getDescriptor());
+				mv.visitFieldInsn(PUTFIELD, field.getDeclaringClass().getName().replace('.', '/'), field.getName(),
+					fieldType.getDescriptor());
 				mv.visitInsn(RETURN);
 			}
 
@@ -273,7 +293,8 @@
 				mv.visitFrame(F_SAME, 0, null, 0, null);
 				mv.visitVarInsn(ALOAD, 1);
 				mv.visitTypeInsn(CHECKCAST, classNameInternal);
-				mv.visitFieldInsn(GETFIELD, classNameInternal, field.getName(), Type.getDescriptor(field.getType()));
+				mv.visitFieldInsn(GETFIELD, field.getDeclaringClass().getName().replace('.', '/'), field.getName(),
+					Type.getDescriptor(field.getType()));
 
 				Type fieldType = Type.getType(field.getType());
 				switch (fieldType.getSort()) {
@@ -338,11 +359,13 @@
 
 			for (int i = 0, n = labels.length; i < n; i++) {
 				if (!labelsi.equals(labelForInvalidTypes)) {
+					Field field = fields.get(i);
 					mv.visitLabel(labelsi);
 					mv.visitFrame(F_SAME, 0, null, 0, null);
 					mv.visitVarInsn(ALOAD, 1);
 					mv.visitTypeInsn(CHECKCAST, classNameInternal);
-					mv.visitFieldInsn(GETFIELD, classNameInternal, fields.get(i).getName(), "Ljava/lang/String;");
+					mv.visitFieldInsn(GETFIELD, field.getDeclaringClass().getName().replace('.', '/'), field.getName(),
+						"Ljava/lang/String;");
 					mv.visitInsn(ARETURN);
 				}
 			}
@@ -361,7 +384,8 @@
 		mv.visitEnd();
 	}
 
-	static private void insertSetPrimitive (ClassWriter cw, String classNameInternal, ArrayList<Field> fields, Type primitiveType) {
+	static private void insertSetPrimitive (ClassWriter cw, String classNameInternal, ArrayList<Field> fields,
+		Type primitiveType) {
 		int maxStack = 6;
 		int maxLocals = 4; // See correction below for LLOAD and DLOAD
 		final String setterMethodName;
@@ -399,8 +423,8 @@
 			break;
 		case Type.DOUBLE:
 			setterMethodName = "setDouble";
-			loadValueInstruction = DLOAD; // (LLOAD and DLOAD actually load two slots)
-			maxLocals++;
+			loadValueInstruction = DLOAD;
+			maxLocals++; // (LLOAD and DLOAD actually load two slots)
 			break;
 		default:
 			setterMethodName = "set";
@@ -430,12 +454,14 @@
 
 			for (int i = 0, n = labels.length; i < n; i++) {
 				if (!labelsi.equals(labelForInvalidTypes)) {
+					Field field = fields.get(i);
 					mv.visitLabel(labelsi);
 					mv.visitFrame(F_SAME, 0, null, 0, null);
 					mv.visitVarInsn(ALOAD, 1);
 					mv.visitTypeInsn(CHECKCAST, classNameInternal);
 					mv.visitVarInsn(loadValueInstruction, 3);
-					mv.visitFieldInsn(PUTFIELD, classNameInternal, fields.get(i).getName(), typeNameInternal);
+					mv.visitFieldInsn(PUTFIELD, field.getDeclaringClass().getName().replace('.', '/'), field.getName(),
+						typeNameInternal);
 					mv.visitInsn(RETURN);
 				}
 			}
@@ -454,7 +480,8 @@
 		mv.visitEnd();
 	}
 
-	static private void insertGetPrimitive (ClassWriter cw, String classNameInternal, ArrayList<Field> fields, Type primitiveType) {
+	static private void insertGetPrimitive (ClassWriter cw, String classNameInternal, ArrayList<Field> fields,
+		Type primitiveType) {
 		int maxStack = 6;
 		final String getterMethodName;
 		final String typeNameInternal = primitiveType.getDescriptor();
@@ -524,7 +551,8 @@
 					mv.visitFrame(F_SAME, 0, null, 0, null);
 					mv.visitVarInsn(ALOAD, 1);
 					mv.visitTypeInsn(CHECKCAST, classNameInternal);
-					mv.visitFieldInsn(GETFIELD, classNameInternal, field.getName(), typeNameInternal);
+					mv.visitFieldInsn(GETFIELD, field.getDeclaringClass().getName().replace('.', '/'), field.getName(),
+						typeNameInternal);
 					mv.visitInsn(returnValueInstruction);
 				}
 			}

_service:tar_scm:reflectasm-1.11.0.tar.gz/src/com/esotericsoftware/reflectasm/MethodAccess.java -> _service:tar_scm:reflectasm-1.11.9.tar.gz/src/com/esotericsoftware/reflectasm/MethodAccess.java Changed

@@ -62,7 +62,8 @@
 	public int getIndex (String methodName, int paramsCount) {
 		for (int i = 0, n = methodNames.length; i < n; i++)
 			if (methodNamesi.equals(methodName) && parameterTypesi.length == paramsCount) return i;
-		throw new IllegalArgumentException("Unable to find non-private method: " + methodName + " with " + paramsCount + " params.");
+		throw new IllegalArgumentException(
+			"Unable to find non-private method: " + methodName + " with " + paramsCount + " params.");
 	}
 
 	public String getMethodNames () {
@@ -77,18 +78,22 @@
 		return returnTypes;
 	}
 
+	/** Creates a new MethodAccess for the specified type.
+	 * @param type Must not be a primitive type, or void. */
 	static public MethodAccess get (Class type) {
-		ArrayList<Method> methods = new ArrayList<Method>();
 		boolean isInterface = type.isInterface();
+		if (!isInterface && type.getSuperclass() == null && type != Object.class)
+			throw new IllegalArgumentException("The type must not be an interface, a primitive type, or void.");
+
+		ArrayList<Method> methods = new ArrayList<Method>();
 		if (!isInterface) {
 			Class nextClass = type;
 			while (nextClass != Object.class) {
 				addDeclaredMethodsToList(nextClass, methods);
 				nextClass = nextClass.getSuperclass();
 			}
-		} else {
+		} else
 			recursiveAddInterfaceMethodsToList(type, methods);
-		}
 
 		int n = methods.size();
 		String methodNames = new Stringn;
@@ -104,13 +109,12 @@
 		String className = type.getName();
 		String accessClassName = className + "MethodAccess";
 		if (accessClassName.startsWith("java.")) accessClassName = "reflectasm." + accessClassName;
-		Class accessClass;
 
+		Class accessClass;
 		AccessClassLoader loader = AccessClassLoader.get(type);
 		synchronized (loader) {
-			try {
-				accessClass = loader.loadClass(accessClassName);
-			} catch (ClassNotFoundException ignored) {
+			accessClass = loader.loadAccessClass(accessClassName);
+			if (accessClass == null) {
 				String accessClassNameInternal = accessClassName.replace('.', '/');
 				String classNameInternal = className.replace('.', '/');
 
@@ -269,7 +273,7 @@
 				}
 				cw.visitEnd();
 				byte data = cw.toByteArray();
-				accessClass = loader.defineClass(accessClassName, data);
+				accessClass = loader.defineAccessClass(accessClassName, data);
 			}
 		}
 		try {
@@ -283,7 +287,7 @@
 		}
 	}
 
-	private static void addDeclaredMethodsToList (Class type, ArrayList<Method> methods) {
+	static private void addDeclaredMethodsToList (Class type, ArrayList<Method> methods) {
 		Method declaredMethods = type.getDeclaredMethods();
 		for (int i = 0, n = declaredMethods.length; i < n; i++) {
 			Method method = declaredMethodsi;
@@ -294,10 +298,9 @@
 		}
 	}
 
-	private static void recursiveAddInterfaceMethodsToList (Class interfaceType, ArrayList<Method> methods) {
+	static private void recursiveAddInterfaceMethodsToList (Class interfaceType, ArrayList<Method> methods) {
 		addDeclaredMethodsToList(interfaceType, methods);
-		for (Class nextInterface : interfaceType.getInterfaces()) {
+		for (Class nextInterface : interfaceType.getInterfaces())
 			recursiveAddInterfaceMethodsToList(nextInterface, methods);
-		}
 	}
 }

_service:tar_scm:reflectasm-1.11.0.tar.gz/test/com/esotericsoftware/reflectasm/ClassLoaderTest.java -> _service:tar_scm:reflectasm-1.11.9.tar.gz/test/com/esotericsoftware/reflectasm/ClassLoaderTest.java Changed

@@ -36,8 +36,9 @@
 		assertEquals("first", testObject.toString());
 		assertEquals("first", access.get(testObject, "name"));
 	}
-	
+
 	public void testAutoUnloadClassloaders () throws Exception {
+		reclaimLoaders();
 		int initialCount = AccessClassLoader.activeAccessClassLoaders();
 
 		ClassLoader testClassLoader1 = new TestClassLoader1();
@@ -55,12 +56,12 @@
 		access2.set(testObject2, "name", "second");
 		assertEquals("second", testObject2.toString());
 		assertEquals("second", access2.get(testObject2, "name"));
-		
+
 		assertEquals(access1.getClass().toString(), access2.getClass().toString()); // Same class names
 		assertFalse(access1.getClass().equals(access2.getClass())); // But different classes
-		
-		assertEquals(initialCount+2, AccessClassLoader.activeAccessClassLoaders());
-		
+
+		assertEquals(initialCount + 2, AccessClassLoader.activeAccessClassLoaders());
+
 		testClassLoader1 = null;
 		testClass1 = null;
 		testObject1 = null;
@@ -69,24 +70,28 @@
 		testClass2 = null;
 		testObject2 = null;
 		access2 = null;
-		
+
+		reclaimLoaders();
+
+		// Yeah, reclaimed!
+		assertEquals(initialCount, AccessClassLoader.activeAccessClassLoaders());
+	}
+
+	private void reclaimLoaders () throws Exception {
 		// Force GC to reclaim unreachable (or only weak-reachable) objects
 		System.gc();
 		try {
-			Object array = new Object(int) Runtime.getRuntime().maxMemory();
+			Object array = new Object(int)Runtime.getRuntime().maxMemory();
 			System.out.println(array.length);
 		} catch (Throwable e) {
 			// Ignore OME
 		}
 		System.gc();
 		int times = 0;
-		while (AccessClassLoader.activeAccessClassLoaders()>1 && times < 50) { // max 5 seconds, should be instant
+		while (AccessClassLoader.activeAccessClassLoaders() > 1 && times < 50) { // max 5 seconds, should be instant
 			Thread.sleep(100); // test again
 			times++;
 		}
-
-		// Yeah, both reclaimed!
-		assertEquals(Math.min(initialCount, 1), AccessClassLoader.activeAccessClassLoaders());
 	}
 
 	public void testRemoveClassloaders () throws Exception {
@@ -107,18 +112,18 @@
 		access2.set(testObject2, "name", "second");
 		assertEquals("second", testObject2.toString());
 		assertEquals("second", access2.get(testObject2, "name"));
-		
+
 		assertEquals(access1.getClass().toString(), access2.getClass().toString()); // Same class names
 		assertFalse(access1.getClass().equals(access2.getClass())); // But different classes
-		
-		assertEquals(initialCount+2, AccessClassLoader.activeAccessClassLoaders());
-		
+
+		assertEquals(initialCount + 2, AccessClassLoader.activeAccessClassLoaders());
+
 		AccessClassLoader.remove(testObject1.getClass().getClassLoader());
-		assertEquals(initialCount+1, AccessClassLoader.activeAccessClassLoaders());
+		assertEquals(initialCount + 1, AccessClassLoader.activeAccessClassLoaders());
 		AccessClassLoader.remove(testObject2.getClass().getClassLoader());
-		assertEquals(initialCount+0, AccessClassLoader.activeAccessClassLoaders());
+		assertEquals(initialCount + 0, AccessClassLoader.activeAccessClassLoaders());
 		AccessClassLoader.remove(this.getClass().getClassLoader());
-		assertEquals(initialCount-1, AccessClassLoader.activeAccessClassLoaders());
+		assertEquals(initialCount - 1, AccessClassLoader.activeAccessClassLoaders());
 	}
 
 	static public class Test {
@@ -128,7 +133,7 @@
 			return name;
 		}
 	}
-	
+
 	static public class TestClassLoader1 extends ClassLoader {
 		protected synchronized Class<?> loadClass (String name, boolean resolve) throws ClassNotFoundException {
 			Class c = findLoadedClass(name);

_service:tar_scm:reflectasm-1.11.0.tar.gz/test/com/esotericsoftware/reflectasm/MethodAccessTest.java -> _service:tar_scm:reflectasm-1.11.9.tar.gz/test/com/esotericsoftware/reflectasm/MethodAccessTest.java Changed

_service:tar_scm:reflectasm.yaml Added

Changes of Revision 3