WebSocketNode远程模式下forceCloseWebSocket会报错

This commit is contained in:
Redkale
2018-07-27 19:38:46 +08:00
parent feaf1a1f06
commit b6c933f989

View File

@@ -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);
}
//--------------------------------------------------------------------------------