From: acolyer <acolyer>
Date: Fri, 14 Apr 2006 16:41:36 +0000 (+0000)
Subject: use signature rather than name when annotation matching as Bcel chops name in the... 
X-Git-Tag: V1_5_2rc1~203
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3e0fc355acc7c525ca290d4740ff7ca70edf408c;p=aspectj.git

use signature rather than name when annotation matching as Bcel chops name in the java.lang package !!
---

diff --git a/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java b/weaver5/java5-src/org/aspectj/weaver/reflect/Java15AnnotationFinder.java
index 6202e9c94..be8d9fd62 100644
--- 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) {