use signature rather than name when annotation matching as Bcel chops name in the...

diff --git a/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java b/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java
index 6202e9c940f53c8e71c442b4dfa74d2050cfeb80..be8d9fd626c79c91538b2e89f8a2dc245021053d 100644 (file)
--- a/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java
+++ b/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java
@@ -118,7 +118,7 @@ public class Java15AnnotationFinder implements AnnotationFinder, ArgNameFinder {
                        // convert to our Annotation type
                        Set<ResolvedType> annSet = new HashSet<ResolvedType>();
                        for (int i = 0; i < anns.length; i++) {
-                               annSet.add(UnresolvedType.forName(anns[i].getTypeName()).resolve(world));
+                               annSet.add(world.resolve(UnresolvedType.forSignature(anns[i].getTypeSignature())));
                        }
                        return annSet;
                } catch (ClassNotFoundException cnfEx) {
@@ -146,7 +146,7 @@ public class Java15AnnotationFinder implements AnnotationFinder, ArgNameFinder {
                        if (anns == null) return new ResolvedType[0];
                        ResolvedType[] ret = new ResolvedType[anns.length];
                        for (int i = 0; i < ret.length; i++) {
-                               ret[i] = inWorld.resolve(anns[i].getTypeName());
+                               ret[i] = inWorld.resolve(UnresolvedType.forSignature(anns[i].getTypeSignature()));
                        }
                        return ret;
                } catch (ClassNotFoundException cnfEx) {