Merge branch '6.1.x'

jhoeller · jhoeller · commit c681614bc2f2 · 2024-06-28T11:36:53.000+02:00
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
@@ -540,7 +540,8 @@ private static boolean compiledByAjc(Class<?> clazz) {
 				return true;
 			}
 		}
-		return false;
+		Class<?> superclass = clazz.getSuperclass();
+		return (superclass != null && compiledByAjc(superclass));
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,8 @@ private static boolean compiledByAjc(Class<?> clazz) {`
`540`	`540`	`return true;`
`541`	`541`	`}`
`542`	`542`	`}`
`543`		`- return false;`
	`543`	`+ Class<?> superclass = clazz.getSuperclass();`
	`544`	`+ return (superclass != null && compiledByAjc(superclass));`
`544`	`545`	`}`
`545`	`546`
`546`	`547`