refactoring

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;
     }
 

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 {