From: aclement <aclement>
Date: Fri, 11 Nov 2005 18:10:09 +0000 (+0000)
Subject: fix for pr113531
X-Git-Tag: V1_5_0RC1~198
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b1d058921b7d8bc44035bbb2c2b38627c09eedbe;p=aspectj.git

fix for pr113531
---

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
index d85743bb0..4754164f9 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
@@ -67,6 +67,8 @@ import org.aspectj.weaver.IClassFileProvider;
 import org.aspectj.weaver.IWeaveRequestor;
 import org.aspectj.weaver.IWeaver;
 import org.aspectj.weaver.NewParentTypeMunger;
+import org.aspectj.weaver.ReferenceType;
+import org.aspectj.weaver.ReferenceTypeDelegate;
 import org.aspectj.weaver.ResolvedTypeMunger;
 import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.ShadowMunger;
@@ -980,7 +982,7 @@ public class BcelWeaver implements IWeaver {
                 if (theType.isAnnotationStyleAspect()) {
                     BcelObjectType classType = BcelWorld.getBcelObjectType(theType);
                     if (classType==null) {
-                        throw new BCException("Can't find bcel delegate for "+className+" type="+theType.getClass());
+                       throw new BCException("Can't find bcel delegate for "+className+" type="+theType.getClass());
                     }
                     LazyClassGen clazz = classType.getLazyClassGen();
                     BcelPerClauseAspectAdder selfMunger = new BcelPerClauseAspectAdder(theType, theType.getPerClause().getKind());
@@ -1053,8 +1055,16 @@ public class BcelWeaver implements IWeaver {
 			String className = classFile.getClassName();
 			ResolvedType theType = world.resolve(className);
 			if (theType.isAspect()) {
-				BcelObjectType classType = BcelWorld.getBcelObjectType(theType);
+			   BcelObjectType classType = BcelWorld.getBcelObjectType(theType);
 				if (classType==null) {
+					
+					// Sometimes.. if the Bcel Delegate couldn't be found then a problem occurred at compile time - on
+					// a previous compiler run.  In this case I assert the delegate will still be an EclipseSourceType
+					// and we can ignore the problem here (the original compile error will be reported again from
+					// the eclipse source type) - pr113531
+					ReferenceTypeDelegate theDelegate = ((ReferenceType)theType).getDelegate();
+					if (theDelegate.getClass().getSimpleName().equals("EclipseSourceType")) continue;
+
 					throw new BCException("Can't find bcel delegate for "+className+" type="+theType.getClass());
 				}
 		        weaveAndNotify(classFile, classType,requestor);