--- xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java~ 2013-11-13 22:39:12.000000000 +0100 +++ xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java 2013-12-05 13:46:32.916772376 +0100 @@ -17,12 +17,12 @@ */ package org.apache.xbean.recipe; -import org.apache.xbean.asm4.ClassReader; -import org.apache.xbean.asm4.Label; -import org.apache.xbean.asm4.MethodVisitor; -import org.apache.xbean.asm4.Opcodes; -import org.apache.xbean.asm4.Type; -import org.apache.xbean.asm4.shade.commons.EmptyVisitor; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; import java.io.IOException; import java.io.InputStream; @@ -211,7 +211,7 @@ } } - private static class AllParameterNamesDiscoveringVisitor extends EmptyVisitor { + private static class AllParameterNamesDiscoveringVisitor extends ClassVisitor { private final Map> constructorParameters = new HashMap>(); private final Map> methodParameters = new HashMap>(); private final Map exceptions = new HashMap(); @@ -220,6 +220,7 @@ private final Map constructorMap = new HashMap(); public AllParameterNamesDiscoveringVisitor(Class type, String methodName) { + super(Opcodes.ASM4); this.methodName = methodName; List methods = new ArrayList(Arrays.asList(type.getMethods())); @@ -232,6 +233,7 @@ } public AllParameterNamesDiscoveringVisitor(Class type) { + super(Opcodes.ASM4); this.methodName = ""; List constructors = new ArrayList(Arrays.asList(type.getConstructors()));