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

修复单个WebSocket并发问题

Browse Source
This commit is contained in:
Redkale
2018-01-15 15:11:25 +08:00
parent 0ee5b911d2
commit ccffa0d5c2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,7 +218,12 @@ class WebSocketRunner implements Runnable {
//if (debug) context.getLogger().log(Level.FINEST, "send web socket message: " + packet); //if (debug) context.getLogger().log(Level.FINEST, "send web socket message: " + packet);
final CompletableFuture<Integer> futureResult = new CompletableFuture<>(); final CompletableFuture<Integer> futureResult = new CompletableFuture<>();
if (writing.getAndSet(true)) { if (writing.getAndSet(true)) {
queue.add(new QueueEntry(futureResult, packet)); QueueEntry qe = new QueueEntry(futureResult, packet);
queue.add(qe);
if (!writing.get()) { //防止刚好CompletionHandler进程在poll之后获取null正准备writing.set(false)时进入queue.add(qe)。导致本消息不能发送
queue.remove(qe);
return sendMessage(packet);
}
return futureResult; return futureResult;
} }
ByteBuffer[] buffers = packet.sendBuffers != null ? packet.duplicateSendBuffers() : packet.encode(this.context.getBufferSupplier()); ByteBuffer[] buffers = packet.sendBuffers != null ? packet.duplicateSendBuffers() : packet.encode(this.context.getBufferSupplier());