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>

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 b0069d840cc6817cd57a7d5e3148e6eba69b5927..55a48e59a0af59efac32aad8b784ef2580a3f409 100644 (file)
--- 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;
                        }