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

Polishing

Browse Source 
(cherry picked from commit 40efcc9)
This commit is contained in:
Juergen Hoeller
2018-06-28 14:51:31 +02:00
parent 3e64388b20
commit a631af80c1
113 changed files with 648 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
View File

@@ -243,10 +243,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

4
spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
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