From 5b32a91874e1cf822aa825b369cd13a7898df02f Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Sat, 23 Dec 2017 10:14:27 +0800 Subject: [PATCH] --- src/org/redkale/asm/asm.txt | 3 +++ src/org/redkale/net/http/WebSocketServlet.java | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/org/redkale/asm/asm.txt b/src/org/redkale/asm/asm.txt index acf853e4b..b23c5feca 100644 --- a/src/org/redkale/asm/asm.txt +++ b/src/org/redkale/asm/asm.txt @@ -8,6 +8,7 @@ ClassReader.java ClassVisitor.java ClassWriter.java Context.java +CurrentFrame.java Edge.java FieldVisitor.java FieldWriter.java @@ -18,6 +19,8 @@ Item.java Label.java MethodVisitor.java MethodWriter.java +ModuleVisitor.java +ModuleWriter.java Opcodes.java Type.java TypePath.java diff --git a/src/org/redkale/net/http/WebSocketServlet.java b/src/org/redkale/net/http/WebSocketServlet.java index 596e4892e..f3e1f0276 100644 --- a/src/org/redkale/net/http/WebSocketServlet.java +++ b/src/org/redkale/net/http/WebSocketServlet.java @@ -198,7 +198,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl @Override public void completed(Integer result, Void attachment) { HttpContext context = response.getContext(); - if (sessionid == null && webSocket.delayPackets != null) { + if (webSocket.delayPackets != null) { WebSocketRunner temprunner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.getChannel()); List delayPackets = webSocket.delayPackets; webSocket.delayPackets = null; @@ -211,7 +211,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl } } cf.whenComplete((v, t) -> response.finish(true)); - return; + if (sessionid == null) return; } CompletableFuture userFuture = webSocket.createUserid(); if (userFuture == null) { @@ -225,7 +225,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl response.finish(true); return; } - if (userid == null && webSocket.delayPackets != null) { + if (webSocket.delayPackets != null) { WebSocketRunner temprunner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.getChannel()); List delayPackets = webSocket.delayPackets; webSocket.delayPackets = null; @@ -238,7 +238,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl } } cf.whenComplete((v, t) -> response.finish(true)); - return; + if (userid == null) return; } webSocket._userid = userid; if (single && !anyuser) {