From 4f7145319fd155c7b89c2d1ff57b1cbe92ab515b Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Sat, 13 May 2017 18:54:39 +0800 Subject: [PATCH] --- src/org/redkale/net/http/WebSocketEngine.java | 8 ++++---- src/org/redkale/net/http/WebSocketServlet.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/redkale/net/http/WebSocketEngine.java b/src/org/redkale/net/http/WebSocketEngine.java index 77f902fc4..d22aab5e5 100644 --- a/src/org/redkale/net/http/WebSocketEngine.java +++ b/src/org/redkale/net/http/WebSocketEngine.java @@ -62,6 +62,10 @@ public final class WebSocketEngine { if (finest) logger.finest(this.getClass().getSimpleName() + "(" + engineid + ")" + " start keeplive(delay:" + delay + ", interval:" + liveinterval + "s) scheduler executor"); } + void destroy(AnyValue conf) { + if (scheduler != null) scheduler.shutdownNow(); + } + void add(WebSocket socket) { WebSocketGroup group = containers.get(socket._groupid); if (group == null) { @@ -93,10 +97,6 @@ public final class WebSocketEngine { return containers.get(groupid); } - void close() { - if (scheduler != null) scheduler.shutdownNow(); - } - public String getEngineid() { return engineid; } diff --git a/src/org/redkale/net/http/WebSocketServlet.java b/src/org/redkale/net/http/WebSocketServlet.java index 30c9eb7de..89c99be1f 100644 --- a/src/org/redkale/net/http/WebSocketServlet.java +++ b/src/org/redkale/net/http/WebSocketServlet.java @@ -89,7 +89,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl final void postDestroy(HttpContext context, AnyValue conf) { this.node.postDestroy(conf); super.destroy(context, conf); - engine.close(); + this.engine.destroy(conf); } @Override