CachingMetadataReaderFactory releases shared cache Map on clearCache()

jhoeller · jhoeller · commit 262c702da458 · 2018-11-22T11:20:47.000+01:00
LocalResourceCache properly initializes cacheLimit on construction.

Issue: SPR-17527
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java b/spring-core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java
@@ -149,6 +149,10 @@ public void clearCache() {
 				this.metadataReaderCache.clear();
 			}
 		}
+		else if (this.metadataReaderCache != null) {
+			// Shared resource cache -> reset to local cache.
+			setCacheLimit(DEFAULT_CACHE_LIMIT);
+		}
 	}
 
 
@@ -159,6 +163,7 @@ private static class LocalResourceCache extends LinkedHashMap<Resource, Metadata
 
 		public LocalResourceCache(int cacheLimit) {
 			super(cacheLimit, 0.75f, true);
+			this.cacheLimit = cacheLimit;
 		}
 
 		public void setCacheLimit(int cacheLimit) {

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,10 @@ public void clearCache() {`
`149`	`149`	`this.metadataReaderCache.clear();`
`150`	`150`	`}`
`151`	`151`	`}`
	`152`	`+ else if (this.metadataReaderCache != null) {`
	`153`	`+ // Shared resource cache -> reset to local cache.`
	`154`	`+ setCacheLimit(DEFAULT_CACHE_LIMIT);`
	`155`	`+ }`
`152`	`156`	`}`
`153`	`157`
`154`	`158`
`@@ -159,6 +163,7 @@ private static class LocalResourceCache extends LinkedHashMap<Resource, Metadata`
`159`	`163`
`160`	`164`	`public LocalResourceCache(int cacheLimit) {`
`161`	`165`	`super(cacheLimit, 0.75f, true);`
	`166`	`+ this.cacheLimit = cacheLimit;`
`162`	`167`	`}`
`163`	`168`
`164`	`169`	`public void setCacheLimit(int cacheLimit) {`