339300

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
index d1ba4203fc56599402fd83003cda45d7063bdd78..649a74b990a66cf64646ec8f74a3071e048a315b 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java
@@ -28,6 +28,7 @@ import org.aspectj.apache.bcel.classfile.Attribute;
 import org.aspectj.apache.bcel.classfile.AttributeUtils;
 import org.aspectj.apache.bcel.classfile.ConstantClass;
 import org.aspectj.apache.bcel.classfile.ConstantPool;
+import org.aspectj.apache.bcel.classfile.EnclosingMethod;
 import org.aspectj.apache.bcel.classfile.Field;
 import org.aspectj.apache.bcel.classfile.InnerClass;
 import org.aspectj.apache.bcel.classfile.InnerClasses;
@@ -842,7 +843,7 @@ public class BcelObjectType extends AbstractReferenceTypeDelegate {
 
        public ResolvedType getOuterClass() {
                if (!isNested()) {
-                       throw new IllegalStateException("Can't get the outer class of a non-nested type");
+                       throw new IllegalStateException("Can't get the outer class of non-nested type: " + className);
                }
 
                // try finding outer class name from InnerClasses attribute assigned to this class
@@ -878,6 +879,19 @@ public class BcelObjectType extends AbstractReferenceTypeDelegate {
                        }
                }
 
+               for (Attribute attr : javaClass.getAttributes()) { // bug339300
+                       ConstantPool cpool = javaClass.getConstantPool();
+                       if (attr instanceof EnclosingMethod) {
+                               EnclosingMethod enclosingMethodAttribute = (EnclosingMethod) attr;
+                               if (enclosingMethodAttribute.getEnclosingClassIndex() != 0) {
+                                       ConstantClass outerClassInfo = enclosingMethodAttribute.getEnclosingClass();
+                                       String outerClassName = cpool.getConstantUtf8(outerClassInfo.getNameIndex()).getValue().replace('/', '.');
+                                       UnresolvedType outer = UnresolvedType.forName(outerClassName);
+                                       return outer.resolve(getResolvedTypeX().getWorld());
+                               }
+                       }
+               }
+
                // try finding outer class name by assuming standard class name mangling convention of javac for this class
                int lastDollar = className.lastIndexOf('$');
                String superClassName = className.substring(0, lastDollar);