src/org/redkale/net/PrepareServlet.java

@@ -50,10 +50,10 @@ public abstract class PrepareServlet<K extends Serializable, C extends Context,
         }
     }
 
-    protected void putMapping(K key, S value) {
+    protected void putMapping(K key, S servlet) {
         synchronized (lock2) {
             Map<K, S> newmappings = new HashMap<>(mappings);
-            newmappings.put(key, value);
+            newmappings.put(key, servlet);
             this.mappings = newmappings;
         }
     }

src/org/redkale/net/http/HttpPrepareServlet.java

@@ -29,7 +29,11 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
 
     protected final Logger logger = Logger.getLogger(this.getClass().getSimpleName());
 
-    protected SimpleEntry<Predicate<String>, HttpServlet>[] regArray = new SimpleEntry[0];
+    protected SimpleEntry<Predicate<String>, HttpServlet>[] regArray = null; //regArray 包含 regWsArray
+
+    protected Map<String, WebSocketServlet> wsmappings = new HashMap<>(); //super.mappings 包含 wsmappings
+
+    protected SimpleEntry<Predicate<String>, WebSocketServlet>[] regWsArray = null;
 
     protected HttpServlet resourceHttpServlet = new HttpResourceServlet();
 
@@ -83,17 +87,34 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
     public void execute(HttpRequest request, HttpResponse response) throws IOException {
         try {
             final String uri = request.getRequestURI();
-            Servlet<HttpContext, HttpRequest, HttpResponse> servlet = mappingServlet(uri);
+            Servlet<HttpContext, HttpRequest, HttpResponse> servlet = null;
-            if (servlet == null && this.regArray != null) {
+            if (request.isWebSocket()) {
-                for (SimpleEntry<Predicate<String>, HttpServlet> en : regArray) {
+                servlet = wsmappings.get(uri);
-                    if (en.getKey().test(uri)) {
+                if (servlet == null && this.regWsArray != null) {
-                        servlet = en.getValue();
+                    for (SimpleEntry<Predicate<String>, WebSocketServlet> en : regWsArray) {
-                        break;
+                        if (en.getKey().test(uri)) {
+                            servlet = en.getValue();
+                            break;
+                        }
                     }
                 }
+                if (servlet == null) {
+                    response.finish(500, null);
+                    return;
+                }
+            } else {
+                servlet = mappingServlet(uri);
+                if (servlet == null && this.regArray != null) {
+                    for (SimpleEntry<Predicate<String>, HttpServlet> en : regArray) {
+                        if (en.getKey().test(uri)) {
+                            servlet = en.getValue();
+                            break;
+                        }
+                    }
+                }
+                //找不到匹配的HttpServlet则使用静态资源HttpResourceServlet
+                if (servlet == null) servlet = this.resourceHttpServlet;
             }
-            //找不到匹配的HttpServlet则使用静态资源HttpResourceServlet
-            if (servlet == null) servlet = this.resourceHttpServlet;
             servlet.execute(request, response);
         } catch (Exception e) {
             request.getContext().getLogger().log(Level.WARNING, "Servlet occur, forece to close channel. request = " + request, e);
@@ -138,8 +159,22 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
                         regArray = Arrays.copyOf(regArray, regArray.length + 1);
                         regArray[regArray.length - 1] = new SimpleEntry<>(Pattern.compile(mapping).asPredicate(), servlet);
                     }
+                    if (servlet instanceof WebSocketServlet) {
+                        if (regWsArray == null) {
+                            regWsArray = new SimpleEntry[1];
+                            regWsArray[0] = new SimpleEntry<>(Pattern.compile(mapping).asPredicate(), (WebSocketServlet) servlet);
+                        } else {
+                            regWsArray = Arrays.copyOf(regWsArray, regWsArray.length + 1);
+                            regWsArray[regWsArray.length - 1] = new SimpleEntry<>(Pattern.compile(mapping).asPredicate(), (WebSocketServlet) servlet);
+                        }
+                    }
                 } else if (mapping != null && !mapping.isEmpty()) {
                     putMapping(mapping, servlet);
+                    if (servlet instanceof WebSocketServlet) {
+                        Map<String, WebSocketServlet> newmappings = new HashMap<>(wsmappings);
+                        newmappings.put(mapping, (WebSocketServlet) servlet);
+                        this.wsmappings = newmappings;
+                    }
                 }
                 if (this.allMapStrings.containsKey(mapping)) {
                     Class old = this.allMapStrings.get(mapping);
@@ -185,6 +220,9 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
             }
         });
         this.allMapStrings.clear();
+        this.wsmappings.clear();
+        this.regArray = null;
+        this.regWsArray = null;
     }
 
 }

src/org/redkale/net/http/HttpRequest.java

@@ -73,6 +73,10 @@ public class HttpRequest extends Request<HttpContext> {
         this.remoteAddrHeader = remoteAddrHeader;
     }
 
+    protected boolean isWebSocket() {
+        return connection != null && connection.contains("Upgrade") && "GET".equalsIgnoreCase(method) && "websocket".equalsIgnoreCase(getHeader("Upgrade"));
+    }
+
     protected void setKeepAlive(boolean keepAlive) {
         this.keepAlive = keepAlive;
     }

src/org/redkale/net/http/WebSocketServlet.java

@@ -98,9 +98,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
     @Override
     public final void execute(final HttpRequest request, final HttpResponse response) throws IOException {
         final boolean debug = logger.isLoggable(Level.FINEST);
-        if (!"GET".equalsIgnoreCase(request.getMethod())
+        if (!request.isWebSocket()) {
-            || !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;