--- old/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java Thu Apr 25 10:09:28 2013 +++ new/src/share/classes/jdk/internal/org/objectweb/asm/commons/RemappingAnnotationAdapter.java Thu Apr 25 10:09:27 2013 @@ -71,18 +71,13 @@ protected final Remapper remapper; - public RemappingAnnotationAdapter( - final AnnotationVisitor av, - final Remapper remapper) - { - this(Opcodes.ASM4, av, remapper); + public RemappingAnnotationAdapter(final AnnotationVisitor av, + final Remapper remapper) { + this(Opcodes.ASM5, av, remapper); } - protected RemappingAnnotationAdapter( - final int api, - final AnnotationVisitor av, - final Remapper remapper) - { + protected RemappingAnnotationAdapter(final int api, + final AnnotationVisitor av, final Remapper remapper) { super(api, av); this.remapper = remapper; } @@ -100,8 +95,7 @@ @Override public AnnotationVisitor visitAnnotation(String name, String desc) { AnnotationVisitor v = av.visitAnnotation(name, remapper.mapDesc(desc)); - return v == null ? null : (v == av - ? this + return v == null ? null : (v == av ? this : new RemappingAnnotationAdapter(v, remapper)); } @@ -108,8 +102,7 @@ @Override public AnnotationVisitor visitArray(String name) { AnnotationVisitor v = av.visitArray(name); - return v == null ? null : (v == av - ? this + return v == null ? null : (v == av ? this : new RemappingAnnotationAdapter(v, remapper)); } }