From 1504c76c2ec2a3dcfce3f0d1143267f09938e179 Mon Sep 17 00:00:00 2001 From: Kezhu Wang Date: Wed, 8 Nov 2017 00:35:24 +0800 Subject: [PATCH] DATAREDIS-728 - Fix unnecessary initial caches map creation in RedisCacheManagerBuilder. We now reuse the initially created map and add or replace initial configurations in place instead of creating each time a new map. Original pull request: #293. --- .../data/redis/cache/RedisCacheManager.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java b/src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java index d6b10749c..5ebe1677e 100644 --- a/src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java +++ b/src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java @@ -221,7 +221,7 @@ public class RedisCacheManager extends AbstractTransactionSupportingCacheManager private final RedisCacheWriter cacheWriter; private RedisCacheConfiguration defaultCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig(); - private Map intialCaches = new LinkedHashMap<>(); + private final Map intialCaches = new LinkedHashMap<>(); private boolean enableTransactions; private RedisCacheManagerBuilder(RedisCacheWriter cacheWriter) { @@ -312,10 +312,7 @@ public class RedisCacheManager extends AbstractTransactionSupportingCacheManager cacheConfigurations.forEach((cacheName, configuration) -> Assert.notNull(configuration, String.format("RedisCacheConfiguration for cache %s must not be null!", cacheName))); - Map cacheConfigMap = new LinkedHashMap<>(intialCaches); - cacheConfigMap.putAll(cacheConfigurations); - - this.intialCaches = cacheConfigMap; + this.intialCaches.putAll(cacheConfigurations); return this; }