Reliable null value handling in ConcurrentMapCache, GuavaCache, JCacheCache

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

Issue: SPR-13553

Author: jhoeller

spring-context-support/src/main/java/org/springframework/cache/guava/GuavaCache.java

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

spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java

@@ -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");
  * you may not use this file except in compliance with the License.
@@ -142,6 +142,10 @@ protected Object toStoreValue(Object userValue) {
 
 	@SuppressWarnings("serial")
 	private static class NullHolder implements Serializable {
+
+		private Object readResolve() {
+			return NULL_HOLDER;
+		}
 	}
 
 }

spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java

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