lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2017-12-23 10:14:27 +08:00
parent 25b2528416
commit 5b32a91874
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/redkale/asm/asm.txt
View File

@@ -8,6 +8,7 @@ ClassReader.java
ClassVisitor.java ClassVisitor.java
ClassWriter.java ClassWriter.java
Context.java Context.java
CurrentFrame.java
Edge.java Edge.java
FieldVisitor.java FieldVisitor.java
FieldWriter.java FieldWriter.java
@@ -18,6 +19,8 @@ Item.java
Label.java Label.java
MethodVisitor.java MethodVisitor.java
MethodWriter.java MethodWriter.java
ModuleVisitor.java
ModuleWriter.java
Opcodes.java Opcodes.java
Type.java Type.java
TypePath.java TypePath.java

8
src/org/redkale/net/http/WebSocketServlet.java
View File

@@ -198,7 +198,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
@Override @Override
public void completed(Integer result, Void attachment) { public void completed(Integer result, Void attachment) {
HttpContext context = response.getContext(); HttpContext context = response.getContext();
if (sessionid == null && webSocket.delayPackets != null) { if (webSocket.delayPackets != null) {
WebSocketRunner temprunner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.getChannel()); WebSocketRunner temprunner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.getChannel());
List<WebSocketPacket> delayPackets = webSocket.delayPackets; List<WebSocketPacket> delayPackets = webSocket.delayPackets;
webSocket.delayPackets = null; webSocket.delayPackets = null;
@@ -211,7 +211,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
} }
} }
cf.whenComplete((v, t) -> response.finish(true)); cf.whenComplete((v, t) -> response.finish(true));
return; if (sessionid == null) return;
} }
CompletableFuture<Serializable> userFuture = webSocket.createUserid(); CompletableFuture<Serializable> userFuture = webSocket.createUserid();
if (userFuture == null) { if (userFuture == null) {
@@ -225,7 +225,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
response.finish(true); response.finish(true);
return; return;
} }
if (userid == null && webSocket.delayPackets != null) { if (webSocket.delayPackets != null) {
WebSocketRunner temprunner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.getChannel()); WebSocketRunner temprunner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.getChannel());
List<WebSocketPacket> delayPackets = webSocket.delayPackets; List<WebSocketPacket> delayPackets = webSocket.delayPackets;
webSocket.delayPackets = null; webSocket.delayPackets = null;
@@ -238,7 +238,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
} }
} }
cf.whenComplete((v, t) -> response.finish(true)); cf.whenComplete((v, t) -> response.finish(true));
return; if (userid == null) return;
} }
webSocket._userid = userid; webSocket._userid = userid;
if (single && !anyuser) { if (single && !anyuser) {