aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2023-08-21 17:37:56 +0700
committerAlexander Kriegisch <Alexander@Kriegisch.name>2023-08-21 17:58:47 +0700
commitd2c35707aeb1f0c950bffb2ff6c88ef449642ec8 (patch)
treed85e21169b59974189c659d008a5018541b8e34e
parente2a355b37935faf9a8de1ce7ca1f134b5a9df891 (diff)
downloadaspectj-d2c35707aeb1f0c950bffb2ff6c88ef449642ec8.tar.gz
aspectj-d2c35707aeb1f0c950bffb2ff6c88ef449642ec8.zip
Fix Spring issue 27761
Fixes spring-projects/spring-framework#27761. Fixes #256. Bridge methods are now ignored in favour of their overriding namesakes during method matching. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
-rw-r--r--org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java
index b0069d840..55a48e59a 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java
@@ -647,7 +647,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl
}
}
// OPTIMIZE speed up matches? optimize order of checks
- if (candidate.matches(aMember, eraseGenerics)) {
+ if (candidate.matches(aMember, eraseGenerics) && !candidate.isBridgeMethod()) {
found = candidate;
break;
}