From 5a1586bc6ab9e4e9dc3014616a43373d9ba52de8 Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Wed, 24 Aug 2016 13:48:52 +0800 Subject: [PATCH] --- src/org/redkale/net/http/WebSocketServlet.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/org/redkale/net/http/WebSocketServlet.java b/src/org/redkale/net/http/WebSocketServlet.java index c510f5aec..ecdbd4c4d 100644 --- a/src/org/redkale/net/http/WebSocketServlet.java +++ b/src/org/redkale/net/http/WebSocketServlet.java @@ -13,6 +13,7 @@ import java.security.*; import java.util.*; import java.util.logging.*; import javax.annotation.*; +import org.redkale.service.WebSocketNodeService; import org.redkale.util.*; /** @@ -67,6 +68,10 @@ public abstract class WebSocketServlet extends HttpServlet { public final void preInit(HttpContext context, AnyValue conf) { InetSocketAddress addr = context.getServerAddress(); this.engine = new WebSocketEngine(addr.getHostString() + ":" + addr.getPort() + "-[" + name() + "]", this.node, logger); + if (this.node == null) { + this.node = new WebSocketNodeService(); + if (logger.isLoggable(Level.INFO)) logger.info("not found WebSocketNode, create a default value for " + getClass().getName()); + } this.node.putWebSocketEngine(engine); this.node.init(conf); this.engine.init(conf); @@ -86,8 +91,8 @@ public abstract class WebSocketServlet extends HttpServlet { public final void execute(final HttpRequest request, final HttpResponse response) throws IOException { final boolean debug = logger.isLoggable(Level.FINEST); if (!"GET".equalsIgnoreCase(request.getMethod()) - || !request.getConnection().contains("Upgrade") - || !"websocket".equalsIgnoreCase(request.getHeader("Upgrade"))) { + || !request.getConnection().contains("Upgrade") + || !"websocket".equalsIgnoreCase(request.getHeader("Upgrade"))) { if (debug) logger.finest("WebSocket connect abort, (Not GET Method) or (Connection != Upgrade) or (Upgrade != websocket). request=" + request); response.finish(true); return;