From b6c933f989de92d8ff473fdaa1de193ee8854f1f Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Fri, 27 Jul 2018 19:38:46 +0800
Subject: [PATCH] =?UTF-8?q?WebSocketNode=E8=BF=9C=E7=A8=8B=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8BforceCloseWebSocket=E4=BC=9A=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/org/redkale/net/http/WebSocketNode.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/redkale/net/http/WebSocketNode.java b/src/org/redkale/net/http/WebSocketNode.java
index 98d25cf82..06108e5a6 100644
--- a/src/org/redkale/net/http/WebSocketNode.java
+++ b/src/org/redkale/net/http/WebSocketNode.java
@@ -244,7 +244,7 @@ public abstract class WebSocketNode {
             }
             return future == null ? CompletableFuture.completedFuture(0) : future;
         });
-        return localFuture.thenCombine(remoteFuture, (a, b) -> a + b);
+        return localFuture == null ? remoteFuture : localFuture.thenCombine(remoteFuture, (a, b) -> a + b);
     }
 
     //--------------------------------------------------------------------------------