From d2c35707aeb1f0c950bffb2ff6c88ef449642ec8 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Mon, 21 Aug 2023 17:37:56 +0700 Subject: 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 --- org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'org.aspectj.matcher/src/main') 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; } -- cgit v1.2.3