From c0f980bf575f8d26f292f2617eaf730b3d0f9951 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Thu, 19 Dec 2019 13:11:40 +0300
Subject: [PATCH] refactoring

---
 .../java/org/redisson/RedissonExecutorService.java     |  2 +-
 .../main/java/org/redisson/remote/BaseRemoteProxy.java |  8 ++++----
 .../main/java/org/redisson/remote/ResponseEntry.java   | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/RedissonExecutorService.java b/redisson/src/main/java/org/redisson/RedissonExecutorService.java
index 70478b976..1f537dcf3 100644
--- a/redisson/src/main/java/org/redisson/RedissonExecutorService.java
+++ b/redisson/src/main/java/org/redisson/RedissonExecutorService.java
@@ -824,7 +824,7 @@ public class RedissonExecutorService implements RScheduledExecutorService {
             List<Result> list = entry.getResponses().remove(requestId);
             if (list != null) {
                 for (Result result : list) {
-                    result.getScheduledFuture().cancel(true);
+                    result.getResponseTimeoutFuture().cancel(true);
                 }
             }
             if (entry.getResponses().isEmpty()) {
diff --git a/redisson/src/main/java/org/redisson/remote/BaseRemoteProxy.java b/redisson/src/main/java/org/redisson/remote/BaseRemoteProxy.java
index 60f0cec3b..6a6f1ebcb 100644
--- a/redisson/src/main/java/org/redisson/remote/BaseRemoteProxy.java
+++ b/redisson/src/main/java/org/redisson/remote/BaseRemoteProxy.java
@@ -142,7 +142,7 @@ public abstract class BaseRemoteProxy {
                         for (Iterator<Result> iterator = list.iterator(); iterator.hasNext();) {
                             Result result = iterator.next();
                             if (result.getPromise() == responseFuture) {
-                                result.getScheduledFuture().cancel(true);
+                                result.getResponseTimeoutFuture().cancel(true);
                                 iterator.remove();
                             }
                         }
@@ -157,7 +157,7 @@ public abstract class BaseRemoteProxy {
                 }
             });
             
-            ScheduledFuture<?> future = commandExecutor.getConnectionManager().getGroup().schedule(new Runnable() {
+            ScheduledFuture<?> responseTimeoutFuture = commandExecutor.getConnectionManager().getGroup().schedule(new Runnable() {
                 @Override
                 public void run() {
                     synchronized (responses) {
@@ -188,7 +188,7 @@ public abstract class BaseRemoteProxy {
                 entryResponses.put(requestId, list);
             }
             
-            Result res = new Result(responseFuture, future);
+            Result res = new Result(responseFuture, responseTimeoutFuture);
             if (insertFirst) {
                 list.add(0, res);
             } else {
@@ -243,7 +243,7 @@ public abstract class BaseRemoteProxy {
                 }
 
                 promise = res.getPromise();
-                res.getScheduledFuture().cancel(true);
+                res.getResponseTimeoutFuture().cancel(true);
                 
                 if (entry.getResponses().isEmpty()) {
                     responses.remove(responseQueueName, entry);
diff --git a/redisson/src/main/java/org/redisson/remote/ResponseEntry.java b/redisson/src/main/java/org/redisson/remote/ResponseEntry.java
index 796641d56..05fd4fcb2 100644
--- a/redisson/src/main/java/org/redisson/remote/ResponseEntry.java
+++ b/redisson/src/main/java/org/redisson/remote/ResponseEntry.java
@@ -33,20 +33,20 @@ public class ResponseEntry {
     public static class Result {
         
         private final RPromise<? extends RRemoteServiceResponse> promise;
-        private final ScheduledFuture<?> scheduledFuture;
+        private final ScheduledFuture<?> responseTimeoutFuture;
         
-        public Result(RPromise<? extends RRemoteServiceResponse> promise, ScheduledFuture<?> scheduledFuture) {
+        public Result(RPromise<? extends RRemoteServiceResponse> promise, ScheduledFuture<?> responseTimeoutFuture) {
             super();
             this.promise = promise;
-            this.scheduledFuture = scheduledFuture;
+            this.responseTimeoutFuture = responseTimeoutFuture;
         }
         
         public <T extends RRemoteServiceResponse> RPromise<T> getPromise() {
             return (RPromise<T>) promise;
         }
         
-        public ScheduledFuture<?> getScheduledFuture() {
-            return scheduledFuture;
+        public ScheduledFuture<?> getResponseTimeoutFuture() {
+            return responseTimeoutFuture;
         }
         
     }