From 9b0332a358bc6ab9310405f0d2de6b8ca94d25c2 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Fri, 9 Oct 2020 10:31:31 +0300
Subject: [PATCH] refactoring

---
 .../java/org/redisson/cache/AbstractCacheMap.java    |  6 ------
 .../java/org/redisson/command/RedisExecutor.java     | 12 ++----------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/cache/AbstractCacheMap.java b/redisson/src/main/java/org/redisson/cache/AbstractCacheMap.java
index a7e78e82d..197f37bf3 100644
--- a/redisson/src/main/java/org/redisson/cache/AbstractCacheMap.java
+++ b/redisson/src/main/java/org/redisson/cache/AbstractCacheMap.java
@@ -481,12 +481,6 @@ public abstract class AbstractCacheMap<K, V> implements Cache<K, V> {
             }
         }
         onValueCreate(entry);
-        if (prevCachedValue != null) {
-            onValueRemove(prevCachedValue);
-            if (!isValueExpired(prevCachedValue)) {
-                return (V) prevCachedValue.getValue();
-            }
-        }
         return null;
     }
 
diff --git a/redisson/src/main/java/org/redisson/command/RedisExecutor.java b/redisson/src/main/java/org/redisson/command/RedisExecutor.java
index 466a57d81..2c9f7d6b8 100644
--- a/redisson/src/main/java/org/redisson/command/RedisExecutor.java
+++ b/redisson/src/main/java/org/redisson/command/RedisExecutor.java
@@ -668,16 +668,8 @@ public class RedisExecutor<V, R> {
         Codec codecToUse = codec;
         ClassLoader threadClassLoader = Thread.currentThread().getContextClassLoader();
         if (threadClassLoader != null) {
-            Map<Codec, Codec> map = CODECS.get(threadClassLoader);
-            if (map == null) {
-                synchronized (CODECS) {
-                    map = CODECS.get(threadClassLoader);
-                    if (map == null) {
-                        map = new LRUCacheMap<>(200, 0, 0);
-                        CODECS.put(threadClassLoader, map);
-                    }
-                }
-            }
+            Map<Codec, Codec> map = CODECS.computeIfAbsent(threadClassLoader, k ->
+                                            new LRUCacheMap<>(200, 0, 0));
             codecToUse = map.get(codec);
             if (codecToUse == null) {
                 try {