From 23d104936390da07eedc832b5b64ecee1cdf8634 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 22 Nov 2018 11:20:47 +0100 Subject: [PATCH] CachingMetadataReaderFactory releases shared cache Map on clearCache() LocalResourceCache properly initializes cacheLimit on construction. Issue: SPR-17527 (cherry picked from commit 262c702da4588e5f467fd24774357113379666b2) --- .../type/classreading/CachingMetadataReaderFactory.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 index 491e7605cdb..e3b8af8cbe1 100644 --- 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -149,6 +149,10 @@ public class CachingMetadataReaderFactory extends SimpleMetadataReaderFactory { this.metadataReaderCache.clear(); } } + else if (this.metadataReaderCache != null) { + // Shared resource cache -> reset to local cache. + setCacheLimit(DEFAULT_CACHE_LIMIT); + } } @@ -159,6 +163,7 @@ public class CachingMetadataReaderFactory extends SimpleMetadataReaderFactory { public LocalResourceCache(int cacheLimit) { super(cacheLimit, 0.75f, true); + this.cacheLimit = cacheLimit; } public void setCacheLimit(int cacheLimit) {