andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix potential reentrance issue in ChannelOutboundBuffer

Browse Source
This commit is contained in:
Trustin Lee 2013-07-24 11:26:03 +09:00
parent 0bc7d3f5d1
commit 5e4169802f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java
View File

@ -325,7 +325,6 @@ public final class ChannelOutboundBuffer {
flushed[head] = null;
ChannelPromise promise = flushedPromises[head];
promise.trySuccess();
flushedPromises[head] = null;
int size = flushedPendingSizes[head];
@ -333,6 +332,7 @@ public final class ChannelOutboundBuffer {
this.head = head + 1 & flushed.length - 1;
promise.trySuccess();
decrementPendingOutboundBytes(size);
return true;
@ -349,7 +349,7 @@ public final class ChannelOutboundBuffer {
safeRelease(msg);
flushed[head] = null;
safeFail(flushedPromises[head], cause);
ChannelPromise promise = flushedPromises[head];
flushedPromises[head] = null;
int size = flushedPendingSizes[head];
@ -357,7 +357,9 @@ public final class ChannelOutboundBuffer {
this.head = head + 1 & flushed.length - 1;
safeFail(promise, cause);
decrementPendingOutboundBytes(size);
return true;
}