refactoring

redisson/src/main/java/org/redisson/RedissonLiveObjectService.java

@@ -273,7 +273,7 @@ public class RedissonLiveObjectService implements RLiveObjectService {
         
         RCascade annotation = ClassUtils.getAnnotation(clazz, fieldName, RCascade.class);
         if (annotation != null) {
-            throw new IllegalArgumentException("RCascade annotation couldn't be defined for non-Redisson object field");
+            throw new IllegalArgumentException("RCascade annotation couldn't be defined for non-Redisson object '" + clazz + "' and field '" + fieldName + "'");
         }
     }
 

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

@@ -831,8 +831,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
                 
                 V value = future.getNow();
                 if (value != null) {
-                    ByteBuf keyState = encodeMapKey(key);
-                    CacheKey cacheKey = toCacheKey(keyState);
+                    CacheKey cacheKey = toCacheKey(key);
                     cache.put(cacheKey, new CacheValue(key, value));
                 }
             }
@@ -1190,7 +1189,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
     }
 
     @Override
-    protected ByteBuf encode(Object value) {
+    public ByteBuf encode(Object value) {
         try {
             return topicCodec.getValueEncoder().encode(value);
         } catch (IOException e) {

redisson/src/main/java/org/redisson/client/RedisConnection.java

@@ -229,8 +229,8 @@ public class RedisConnection implements RedisCommands {
         return new CommandData<T, R>(promise, encoder, command, params);
     }
 
-    public void setClosed(boolean reconnect) {
-        this.closed = reconnect;
+    public void setClosed(boolean closed) {
+        this.closed = closed;
     }
 
     public boolean isClosed() {

redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java

@@ -54,7 +54,7 @@ public class ClientConnectionsEntry {
     private FreezeReason freezeReason;
     final RedisClient client;
 
-    private NodeType nodeType;
+    private volatile NodeType nodeType;
     private ConnectionManager connectionManager;
 
     private final AtomicInteger failedAttempts = new AtomicInteger();

redisson/src/main/java/org/redisson/connection/balancer/LoadBalancerManager.java

@@ -78,11 +78,6 @@ public class LoadBalancerManager {
         }
     }
     
-    public void changeType(URI address, NodeType nodeType) {
-        ClientConnectionsEntry entry = getEntry(address);
-        changeType(nodeType, entry);
-    }
-    
     public RFuture<Void> add(final ClientConnectionsEntry entry) {
         RPromise<Void> result = new RedissonPromise<Void>();