Merge branch 'master' of github.com:redisson/redisson

redisson/src/main/java/org/redisson/RedissonLocalCachedMap.java

@@ -144,6 +144,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
         }
         listener.notifyInvalidate(new CacheValue(key, oldV));
         listener.notifyUpdate(newValue);
+        localCacheView.putCacheKey(key, cacheKey);
         return oldValue;
     }
 

redisson/src/main/java/org/redisson/cache/LocalCacheView.java

@@ -281,16 +281,18 @@ public class LocalCacheView<K, V> {
         }
         ByteBuf encoded = object.encodeMapKey(key);
         try {
-            cacheKey = toCacheKey(encoded);
-            if (useObjectAsCacheKey) {
-                cacheKeyMap.put(key, cacheKey);
-            }
-            return cacheKey;
+            return toCacheKey(encoded);
         } finally {
             encoded.release();
         }
     }
 
+    public void putCacheKey(Object key, CacheKey cacheKey) {
+        if (useObjectAsCacheKey) {
+            cacheKeyMap.put(key, cacheKey);
+        }
+    }
+
     public CacheKey toCacheKey(ByteBuf encodedKey) {
         return new CacheKey(Hash.hash128toArray(encodedKey));
     }