From: aclement <aclement>
Date: Sun, 1 Feb 2009 03:48:07 +0000 (+0000)
Subject: 148285: test and fixes
X-Git-Tag: pre268419~142
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=874e933743722b65d5971eae9ea8563a4ae5882b;p=aspectj.git

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 0ce435500..8765b63d2 100644
--- 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;
 						}