refactoring

redisson · Nov 25, 2016 · 72c9afe · 72c9afe
1 parent 922d5b8
commit 72c9afe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/redisson/src/main/java/org/redisson/RedissonExecutorService.java b/redisson/src/main/java/org/redisson/RedissonExecutorService.java
@@ -171,7 +171,7 @@ protected RFuture<Long> pushTaskAsync() {
                       + "end "
                       + "return nil;",
                       Arrays.<Object>asList(requestQueueName, schedulerQueueName, schedulerTasksName), 
-                      System.currentTimeMillis(), 10);
+                      System.currentTimeMillis(), 100);
             }
         };
         scheduler.start();

diff --git a/redisson/src/main/java/org/redisson/client/RedisConnection.java b/redisson/src/main/java/org/redisson/client/RedisConnection.java
@@ -36,7 +36,6 @@
 import io.netty.util.AttributeKey;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.FutureListener;
-import io.netty.util.concurrent.Promise;
 import io.netty.util.concurrent.ScheduledFuture;
 
 public class RedisConnection implements RedisCommands {
@@ -52,8 +51,6 @@ public class RedisConnection implements RedisCommands {
     private ReconnectListener reconnectListener;
     private long lastUsageTime;
 
-    private final RFuture<?> acquireFuture = RedissonPromise.newSucceededFuture(this);
-
     public RedisConnection(RedisClient redisClient, Channel channel) {
         super();
         this.redisClient = redisClient;
@@ -246,10 +243,6 @@ public String toString() {
         return getClass().getSimpleName() + "@" + System.identityHashCode(this) + " [redisClient=" + redisClient + ", channel=" + channel + "]";
     }
 
-    public RFuture<?> getAcquireFuture() {
-        return acquireFuture;
-    }
-
     public void onDisconnect() {
     }
 

diff --git a/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java b/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java
@@ -329,15 +329,15 @@ private void decodeList(ByteBuf in, CommandData<Object, Object> data, List<Objec
             // store current message index
             checkpoint();
 
-            handleMultiResult(data, null, channel, result);
+            handlePublishSubscribe(data, null, channel, result);
             // has next messages?
             if (in.writerIndex() > in.readerIndex()) {
                 decode(in, data, null, channel);
             }
         }
     }
 
-    private void handleMultiResult(CommandData<Object, Object> data, List<Object> parts,
+    private void handlePublishSubscribe(CommandData<Object, Object> data, List<Object> parts,
             Channel channel, final Object result) {
         if (result instanceof PubSubStatusMessage) {
             String channelName = ((PubSubStatusMessage) result).getChannel();