summaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authoraclement <aclement>2006-04-21 17:56:42 +0000
committeraclement <aclement>2006-04-21 17:56:42 +0000
commit8cbcae72de6f0b2b8bca9d63edd10ae04982e94f (patch)
tree5dbc1ee9653bdfcbb8ae68897c23903c3b3c3995 /weaver
parent5b354c21ff2b4754522f75324f8094958804a753 (diff)
downloadaspectj-8cbcae72de6f0b2b8bca9d63edd10ae04982e94f.tar.gz
aspectj-8cbcae72de6f0b2b8bca9d63edd10ae04982e94f.zip
fix for 137496: problem with join point matching on calls to parameterized methods
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/ResolvedType.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/weaver/src/org/aspectj/weaver/ResolvedType.java b/weaver/src/org/aspectj/weaver/ResolvedType.java
index bfb7be4c5..d220bcb0c 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedType.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedType.java
@@ -345,6 +345,9 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl
while (i.hasNext()) {
ResolvedMember f = (ResolvedMember) i.next();
if (matches(f, m)) return f;
+ if (f.hasBackingGenericMember() && m.getName().equals(f.getName())) { // might be worth checking the method behind the parameterized method (see pr137496)
+ if (matches(f.getBackingGenericMember(),m)) return f;
+ }
}
return null; //ResolvedMember.Missing;
//throw new BCException("can't find " + m);