lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WebSocketNode远程模式下forceCloseWebSocket会报错

Browse Source
This commit is contained in:
Redkale
2018-07-27 19:38:46 +08:00
parent feaf1a1f06
commit b6c933f989
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/redkale/net/http/WebSocketNode.java
View File

@@ -244,7 +244,7 @@ public abstract class WebSocketNode {
} }
return future == null ? CompletableFuture.completedFuture(0) : future; 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);
} }
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------