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-05-20 13:43:02 +08:00
parent 46ccd83acc
commit 0859dee201
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/org/redkale/net/http/WebSocketRunner.java
View File

@@ -191,7 +191,13 @@ public class WebSocketRunner implements Runnable {
@Override @Override
public void completed(Integer result, ByteBuffer attachment) { public void completed(Integer result, ByteBuffer attachment) {
if (attachment == null || closed) return; if (attachment == null || closed) {
if (future != null) {
future.complete(RETCODE_WSOCKET_CLOSED);
future = null;
}
return;
}
try { try {
if (attachment.hasRemaining()) { if (attachment.hasRemaining()) {
if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner write completed reemaining: " + attachment.remaining()); if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner write completed reemaining: " + attachment.remaining());
@@ -204,8 +210,15 @@ public class WebSocketRunner implements Runnable {
} }
QueueEntry entry = queue.poll(); QueueEntry entry = queue.poll();
ByteBuffer localWriteBuffer = writeBuffer; ByteBuffer localWriteBuffer = writeBuffer;
if (entry == null || localWriteBuffer == null) return; //没有数据了 if (entry == null) return; //没有数据了
future = entry.future; future = entry.future;
if (localWriteBuffer == null) {
if (future != null) {
future.complete(RETCODE_WSOCKET_CLOSED);
future = null;
}
return;
}
byte[] bs = entry.bytes; byte[] bs = entry.bytes;
ByteBuffer sendBuffer; ByteBuffer sendBuffer;
if (bs.length <= localWriteBuffer.capacity()) { if (bs.length <= localWriteBuffer.capacity()) {
@@ -217,7 +230,6 @@ public class WebSocketRunner implements Runnable {
sendBuffer = ByteBuffer.wrap(bs); sendBuffer = ByteBuffer.wrap(bs);
} }
channel.write(sendBuffer, sendBuffer, this); channel.write(sendBuffer, sendBuffer, this);
} catch (Exception e) { } catch (Exception e) {
closeRunner(); closeRunner();
context.getLogger().log(Level.WARNING, "WebSocket sendMessage abort on rewrite, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", e); context.getLogger().log(Level.WARNING, "WebSocket sendMessage abort on rewrite, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", e);