252722: test and fix: generated super dispatch methods

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AjcMemberMaker.java b/org.aspectj.matcher/src/org/aspectj/weaver/AjcMemberMaker.java
index e7614157789bd2db2d8bedeb7df8cb3d033f260f..8d45b636984c7b608bf93a87440b950fe53981c5 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AjcMemberMaker.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/AjcMemberMaker.java
@@ -262,8 +262,12 @@ public class AjcMemberMaker {
        // --- inline accessors
        // ??? can eclipse handle a transform this weird without putting synthetics into the mix
        public static ResolvedMember superAccessMethod(UnresolvedType baseType, ResolvedMember method) {
+               UnresolvedType[] paramTypes = method.getParameterTypes();
+               // if (!method.isStatic()) {
+               // paramTypes = UnresolvedType.insert(method.getDeclaringType(), paramTypes);
+               // }
                return new ResolvedMemberImpl(Member.METHOD, baseType, Modifier.PUBLIC, method.getReturnType(), NameMangler
-                               .superDispatchMethod(baseType, method.getName()), method.getParameterTypes(), method.getExceptions());
+                               .superDispatchMethod(baseType, method.getName()), paramTypes, method.getExceptions());
        }
 
        public static ResolvedMember inlineAccessMethodForMethod(UnresolvedType aspectType, ResolvedMember method) {