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

SPR-8238 

+ add handling for null arguments to prevent NPE in default key generation
This commit is contained in:
Costin Leau 2011-04-21 08:00:42 +00:00
parent d14c7f2d09
commit e1d19d6c24
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.context/src/main/java/org/springframework/cache/support/DefaultKeyGenerator.java vendored
View File

@ -22,7 +22,7 @@ import org.springframework.cache.KeyGenerator;
/** /**
* Default key generator. Returns 0 if no param is given, the param itself if only one is given or a hash code computed * Default key generator. Returns 0 if no param is given, the param itself if only one is given or a hash code computed
* from all given params hash code. * from all given params hash code. Uses a constant (53) for null objects.
* *
* @author Costin Leau * @author Costin Leau
*/ */
@ -30,7 +30,7 @@ public class DefaultKeyGenerator implements KeyGenerator<Object> {
public Object extract(Object target, Method method, Object... params) { public Object extract(Object target, Method method, Object... params) {
if (params.length == 1) { if (params.length == 1) {
return params[0]; return (params[0] == null ? 53 : params[0]);
} }
if (params.length == 0) { if (params.length == 0) {
@ -40,7 +40,7 @@ public class DefaultKeyGenerator implements KeyGenerator<Object> {
int hashCode = 17; int hashCode = 17;
for (Object object : params) { for (Object object : params) {
hashCode = 31 * hashCode + object.hashCode(); hashCode = 31 * hashCode + (object == null ? 53 : object.hashCode());
} }
return Integer.valueOf(hashCode); return Integer.valueOf(hashCode);