refactor cancel future.

apache · Jan 10, 2019 · 5fdd75b · 5fdd75b
1 parent 740be9c
commit 5fdd75b
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/.../dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractClient.java b/.../dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractClient.java
@@ -152,24 +152,7 @@ private synchronized void initConnectStatusCheckCommand() {
                 @Override
                 public void run() {
                     try {
-
-                        /**
-                         * If the provider service is detected offline,
-                         * the client should not attempt to connect again.
-                         *
-                         * issue: https://github.com/apache/incubator-dubbo/issues/3158
-                         */
-                        if(isClosed()) {
-                            ScheduledFuture<?> future = reconnectExecutorFuture;
-                            if(future != null && !future.isCancelled()){
-                                /**
-                                 *  Client has been destroyed and
-                                 *  scheduled task should be cancelled.
-                                 */
-                                future.cancel(true);
-                            }
-                            return;
-                        }
+                        if (cancelFutureIfOffline()) return;
 
                         if (!isConnected()) {
                             connect();
@@ -191,7 +174,29 @@ public void run() {
                         }
                     }
                 }
+
+                private boolean cancelFutureIfOffline() {
+                    /**
+                     * If the provider service is detected offline,
+                     * the client should not attempt to connect again.
+                     *
+                     * issue: https://github.com/apache/incubator-dubbo/issues/3158
+                     */
+                    if(isClosed()) {
+                        ScheduledFuture<?> future = reconnectExecutorFuture;
+                        if(future != null && !future.isCancelled()){
+                            /**
+                             *  Client has been destroyed and
+                             *  scheduled task should be cancelled.
+                             */
+                            future.cancel(true);
+                        }
+                        return true;
+                    }
+                    return false;
+                }
             };
+
             reconnectExecutorFuture = reconnectExecutorService.scheduleWithFixedDelay(connectStatusCheckCommand, reconnect, reconnect, TimeUnit.MILLISECONDS);
         }
     }