root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

AbstractFallbackTransactionAttributeSource's DefaultCacheKey takes targetClass into account (again) 

Issue: SPR-12536
(cherry picked from commit 4efe6a8)
This commit is contained in:
Juergen Hoeller 2014-12-22 14:01:19 +01:00
parent 9cb1569e67
commit c087e51b80
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-context/src/main/java/org/springframework/cache/interceptor/AbstractFallbackCacheOperationSource.java vendored
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -213,13 +213,14 @@ public abstract class AbstractFallbackCacheOperationSource implements CacheOpera
return false; return false;
} }
DefaultCacheKey otherKey = (DefaultCacheKey) other; DefaultCacheKey otherKey = (DefaultCacheKey) other;
return (this.method.equals(otherKey.method) && ObjectUtils.nullSafeEquals(this.targetClass, return (this.method.equals(otherKey.method) &&
otherKey.targetClass)); ObjectUtils.nullSafeEquals(this.targetClass, otherKey.targetClass));
} }
@Override @Override
public int hashCode() { 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);
} }
} }
} }

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -227,7 +227,7 @@ public abstract class AbstractFallbackTransactionAttributeSource implements Tran
@Override @Override
public int hashCode() { public int hashCode() {
return this.method.hashCode(); return this.method.hashCode() + (this.targetClass != null ? this.targetClass.hashCode() * 29 : 0);
} }
} }