From 7bf8d60ddfb68236d7275fe3db342c8793bf27b6 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Mon, 2 Apr 2018 16:28:21 +0800
Subject: [PATCH]

---
 src/org/redkale/service/WebSocketNodeService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/redkale/service/WebSocketNodeService.java b/src/org/redkale/service/WebSocketNodeService.java
index d6d8efcca..2ebd66e76 100644
--- a/src/org/redkale/service/WebSocketNodeService.java
+++ b/src/org/redkale/service/WebSocketNodeService.java
@@ -41,11 +41,13 @@ public class WebSocketNodeService extends WebSocketNode implements Service {
         if (localSncpAddress == null || !localSncpAddress.equals(targetAddress)) return remoteWebSocketAddresses(targetAddress, groupid);
         if (this.localEngine == null) return CompletableFuture.completedFuture(new ArrayList<>());
 
-        ExecutorService executor = ForkJoinPool.commonPool();
+        ExecutorService executor = null;
         Thread thread = Thread.currentThread();
         if (thread instanceof WorkThread) {
             executor = ((WorkThread) thread).getExecutor();
         }
+        if (executor == null) executor = ForkJoinPool.commonPool();
+        
         return CompletableFuture.supplyAsync(() -> {
             final List<String> rs = new ArrayList<>();
             this.localEngine.getLocalWebSockets(groupid).forEach(x -> rs.add(x.getRemoteAddr()));