Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

Browse Source 
# Conflicts:
#	spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
This commit is contained in:
Juergen Hoeller
2023-08-14 19:29:14 +02:00
parent 9c74c25961 2ce75dc415
commit 45c20e34e4
7 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
View File

@@ -57,8 +57,8 @@ class TransactionAttributeSourcePointcut extends StaticMethodMatcherPointcut imp
@Override
public boolean equals(@Nullable Object other) {
return (this == other || (other instanceof TransactionAttributeSourcePointcut otherPc &&
ObjectUtils.nullSafeEquals(this.transactionAttributeSource, otherPc.transactionAttributeSource)));
return (this == other || (other instanceof TransactionAttributeSourcePointcut that &&
ObjectUtils.nullSafeEquals(this.transactionAttributeSource, that.transactionAttributeSource)));
}
@Override