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

Reliable null value handling in ConcurrentMapCache, GuavaCache, JCacheCache

Browse Source 
The 4.1 variant of this fix just introduces readResolve declarations to the existing NullHolder classes.

Issue: SPR-13553
This commit is contained in:
Juergen Hoeller
2015-10-10 22:43:06 +02:00
parent 57125c0adc
commit de932903ca
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-context-support/src/main/java/org/springframework/cache/guava/GuavaCache.java vendored
View File

@@ -28,8 +28,8 @@ import org.springframework.cache.support.SimpleValueWrapper;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
* Spring {@link Cache} adapter implementation on top of a * Spring {@link org.springframework.cache.Cache} adapter implementation
* Guava {@link com.google.common.cache.Cache} instance. * on top of a Guava {@link com.google.common.cache.Cache} instance.
* *
* <p>Requires Google Guava 12.0 or higher. * <p>Requires Google Guava 12.0 or higher.
* *
@@ -174,6 +174,10 @@ public class GuavaCache implements Cache {
@SuppressWarnings("serial") @SuppressWarnings("serial")
private static class NullHolder implements Serializable { private static class NullHolder implements Serializable {
private Object readResolve() {
return NULL_HOLDER;
}
} }

6
spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java vendored
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 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.
@@ -142,6 +142,10 @@ public class JCacheCache implements Cache {
@SuppressWarnings("serial") @SuppressWarnings("serial")
private static class NullHolder implements Serializable { private static class NullHolder implements Serializable {
private Object readResolve() {
return NULL_HOLDER;
}
} }
} }

8
spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java vendored
View File

@@ -25,8 +25,8 @@ import org.springframework.cache.support.SimpleValueWrapper;
import org.springframework.util.Assert; import org.springframework.util.Assert;
/** /**
* Simple {@link Cache} implementation based on the core JDK * Simple {@link org.springframework.cache.Cache} implementation based on the
* {@code java.util.concurrent} package. * core JDK {@code java.util.concurrent} package.
* *
* <p>Useful for testing or simple caching scenarios, typically in combination * <p>Useful for testing or simple caching scenarios, typically in combination
* with {@link org.springframework.cache.support.SimpleCacheManager} or * with {@link org.springframework.cache.support.SimpleCacheManager} or
@@ -172,6 +172,10 @@ public class ConcurrentMapCache implements Cache {
@SuppressWarnings("serial") @SuppressWarnings("serial")
private static class NullHolder implements Serializable { private static class NullHolder implements Serializable {
private Object readResolve() {
return NULL_HOLDER;
}
} }
} }