admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2018-06-28 14:51:31 +02:00
parent b68e692854
commit 40efcc933c
107 changed files with 510 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
+3 -3
View File
@@ -246,10 +246,10 @@ public class SpringContextResourceAdapter implements ResourceAdapter {
@Override
public boolean equals(Object obj) {
return (obj instanceof SpringContextResourceAdapter &&
public boolean equals(Object other) {
return (this == other || (other instanceof SpringContextResourceAdapter &&
ObjectUtils.nullSafeEquals(getContextConfigLocation(),
((SpringContextResourceAdapter) obj).getContextConfigLocation()));
((SpringContextResourceAdapter) other).getContextConfigLocation())));
}
@Override
spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
+2 -2
View File
@@ -75,8 +75,8 @@ public abstract class DelegatingTransactionDefinition implements TransactionDefi
@Override
public boolean equals(Object obj) {
return this.targetDefinition.equals(obj);
public boolean equals(Object other) {
return this.targetDefinition.equals(other);
}
@Override