fix and test Bugzilla Bug 37739

   Unexpected Xlint:unresolvableMember warning with withincode

1 files changed, 4 insertions, 1 deletions

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
index c91731e0e..058231bab 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
@@ -828,9 +828,12 @@ public class BcelShadow extends Shadow {
     	}
     }
     
+    //??? need to better understand all the enclosing variants
     public Member getEnclosingCodeSignature() {
-    	if (enclosingShadow == null) {
+    	if (getKind().isEnclosingKind()) {
     		return getSignature();
+    	} else if (enclosingShadow == null) {
+    		return getEnclosingMethod().getMemberView();
     	} else {
     		return enclosingShadow.getSignature();
     	}