148285: test and fixes

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
index 0ce4355007e512414f582776dbae539dcf4d38b0..8765b63d200650edb45b02fec2d6487add6b905d 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
@@ -1262,9 +1262,10 @@ public class AjState implements CompilerConfigurationChangeFlags {
                                        if (typeName.indexOf(BcelWeaver.SYNTHETIC_CLASS_POSTFIX) == -1) {
                                                ResolvedType rt = world.resolve(typeName);
                                                if (rt.isMissing()) {
-                                                       throw new IllegalStateException("Type '" + rt.getSignature() + "' not found in world!");
-                                               }
-                                               if (rt.isAspect()) {
+                                                       // This can happen in a case where another problem has occurred that prevented it being
+                                                       // correctly added to the world. Eg. pr148285. Duplicate types
+                                                       // throw new IllegalStateException("Type '" + rt.getSignature() + "' not found in world!");
+                                               } else if (rt.isAspect()) {
                                                        this.sourceFilesDefiningAspects.add(sourceFile);
                                                        break;
                                                }