AbstractFallbackTransactionAttributeSource's DefaultCacheKey takes targetClass into account (again)

jhoeller · jhoeller · commit c087e51b8006 · 2014-12-22T16:26:25.000+01:00
Issue: SPR-12536 (cherry picked from commit 4efe6a8)
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -213,13 +213,14 @@ public boolean equals(Object other) {
 				return false;
 			}
 			DefaultCacheKey otherKey = (DefaultCacheKey) other;
-			return (this.method.equals(otherKey.method) && ObjectUtils.nullSafeEquals(this.targetClass,
-					otherKey.targetClass));
+			return (this.method.equals(otherKey.method) &&
+					ObjectUtils.nullSafeEquals(this.targetClass, otherKey.targetClass));
 		}
 
 		@Override
 		public int hashCode() {
-			return this.method.hashCode() * 29 + (this.targetClass != null ? this.targetClass.hashCode() : 0);
+			return this.method.hashCode() + (this.targetClass != null ? this.targetClass.hashCode() * 29 : 0);
 		}
 	}
+
 }
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -227,7 +227,7 @@ public boolean equals(Object other) {
 
 		@Override
 		public int hashCode() {
-			return this.method.hashCode();
+			return this.method.hashCode() + (this.targetClass != null ? this.targetClass.hashCode() * 29 : 0);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2012 the original author or authors.`
	`2`	`+ * Copyright 2002-2014 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -213,13 +213,14 @@ public boolean equals(Object other) {`
`213`	`213`	`return false;`
`214`	`214`	`}`
`215`	`215`	`DefaultCacheKey otherKey = (DefaultCacheKey) other;`
`216`		`- return (this.method.equals(otherKey.method) && ObjectUtils.nullSafeEquals(this.targetClass,`
`217`		`- otherKey.targetClass));`
	`216`	`+ return (this.method.equals(otherKey.method) &&`
	`217`	`+ ObjectUtils.nullSafeEquals(this.targetClass, otherKey.targetClass));`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`@Override`
`221`	`221`	`public int hashCode() {`
`222`		`- return this.method.hashCode() * 29 + (this.targetClass != null ? this.targetClass.hashCode() : 0);`
	`222`	`+ return this.method.hashCode() + (this.targetClass != null ? this.targetClass.hashCode() * 29 : 0);`
`223`	`223`	`}`
`224`	`224`	`}`
	`225`	`+`
`225`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2013 the original author or authors.`
	`2`	`+ * Copyright 2002-2014 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -227,7 +227,7 @@ public boolean equals(Object other) {`
`227`	`227`
`228`	`228`	`@Override`
`229`	`229`	`public int hashCode() {`
`230`		`- return this.method.hashCode();`
	`230`	`+ return this.method.hashCode() + (this.targetClass != null ? this.targetClass.hashCode() * 29 : 0);`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`