176905: test and fix

1 files changed, 2 insertions, 7 deletions

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelField.java b/weaver/src/org/aspectj/weaver/bcel/BcelField.java
index 10a6ae97a..0bc231c7b 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelField.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelField.java
@@ -184,14 +184,9 @@ final class BcelField extends ResolvedMemberImpl {
 			annotationTypes = new HashSet();
 		}
 		// Add it to the set of annotation types
-		annotationTypes.add(UnresolvedType.forName(annotation.getTypeName()).resolve(world));
+		String typename = annotation.getTypeSignature();
+		annotationTypes.add(UnresolvedType.forSignature(typename).resolve(world));
 		annotationsAdded=true;
-		// FIXME asc this call here suggests we are managing the annotations at
-		// too many levels, here in BcelField we keep a set and in the lower 'field'
-		// object we keep a set - we should think about reducing this to one
-		// level??
-		//field.addAnnotation(annotation.getBcelAnnotation());
-		// FIXME CUSTARD
 	}
 	
 	/**