Merge branch '6.0.x'

sbrannen · Sep 23, 2023 · ebd4f1b · ebd4f1b
2 parents bc03088 + 08237da
commit ebd4f1b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...rg/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/...rg/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
@@ -302,10 +302,12 @@ private boolean isAspectMaterialized() {
 
 		@Override
 		public boolean equals(@Nullable Object other) {
+			// For equivalence, we only need to compare the preInstantiationPointcut fields since
+			// they include the declaredPointcut fields. In addition, we should not compare the
+			// aspectInstanceFactory fields since LazySingletonAspectInstanceFactoryDecorator does
+			// not implement equals().
 			return (this == other || (other instanceof PerTargetInstantiationModelPointcut that &&
-					ObjectUtils.nullSafeEquals(this.declaredPointcut, that.declaredPointcut) &&
-					ObjectUtils.nullSafeEquals(this.preInstantiationPointcut, that.preInstantiationPointcut) &&
-					ObjectUtils.nullSafeEquals(this.aspectInstanceFactory, that.aspectInstanceFactory)));
+					ObjectUtils.nullSafeEquals(this.preInstantiationPointcut, that.preInstantiationPointcut)));
 		}
 
 		@Override