Index: src/org/aspectj/weaver/bcel/BcelWorld.java
===================================================================
RCS file: /home/technology/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/BcelWorld.java,v
retrieving revision 1.17
diff -u -r1.17 BcelWorld.java
--- src/org/aspectj/weaver/bcel/BcelWorld.java	4 Jan 2005 13:15:57 -0000	1.17
+++ src/org/aspectj/weaver/bcel/BcelWorld.java	7 Feb 2005 13:05:14 -0000
@@ -235,11 +235,15 @@
 	
 	public BcelObjectType addSourceObjectType(JavaClass jc) {
 		String signature = TypeX.forName(jc.getClassName()).getSignature();
-        ResolvedTypeX.Name nameTypeX = (ResolvedTypeX.Name)typeMap.get(signature);
 
-        if (nameTypeX == null) {
-        	nameTypeX = new ResolvedTypeX.Name(signature, this);
+		ResolvedTypeX.Name nameTypeX;
+        Object typeX = typeMap.get(signature);
+        if (typeX == null || !(typeX instanceof ResolvedTypeX.Name)) {
+                nameTypeX = new ResolvedTypeX.Name(signature, this);
+        } else {
+                nameTypeX = (ResolvedTypeX.Name)typeX;
         }
+
         BcelObjectType ret = makeBcelObjectType(nameTypeX, jc, true);
         nameTypeX.setDelegate(ret);
         typeMap.put(signature, nameTypeX);