482945: obfuscated class file finding outer class

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AbstractReferenceTypeDelegate.java b/org.aspectj.matcher/src/org/aspectj/weaver/AbstractReferenceTypeDelegate.java
index f735049273977160be0442b90ba6cc579c33337a..46f12c04ee02b6868387a8ff0270a63b339b430a 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AbstractReferenceTypeDelegate.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/AbstractReferenceTypeDelegate.java
@@ -107,9 +107,13 @@ public abstract class AbstractReferenceTypeDelegate implements ReferenceTypeDele
                List<GenericSignature.FormalTypeParameter> typeParameters = new ArrayList<GenericSignature.FormalTypeParameter>();
                ResolvedType outerClassType = getOuterClass();
                if (!(outerClassType instanceof ReferenceType)) {
-                       throw new BCException("Whilst processing type '" + this.resolvedTypeX.getSignature()
-                                       + "' - cannot cast the outer type to a reference type.  Signature=" + outerClassType.getSignature()
-                                       + " toString()=" + outerClassType.toString());
+                       if (outerClassType == null) {
+                               return GenericSignature.FormalTypeParameter.NONE;
+                       } else {
+                               throw new BCException("Whilst processing type '" + this.resolvedTypeX.getSignature()
+                                               + "' - cannot cast the outer type to a reference type.  Signature=" + outerClassType.getSignature()
+                                               + " toString()=" + outerClassType.toString());
+                       }
                }
                ReferenceType outer = (ReferenceType) outerClassType;
                ReferenceTypeDelegate outerDelegate = outer.getDelegate();