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

Fix a bug where ChannelOutboundBuffer.addFlush() is called multiple times

Browse Source
This commit is contained in:
Trustin Lee 2013-07-12 20:01:38 +09:00
parent e2fcb06d9a
commit 529d904d29
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
transport/src/main/java/io/netty/channel/AbstractChannel.java
View File

@ -595,7 +595,10 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
@Override @Override
public void flush() { public void flush() {
outboundBuffer.addFlush(); outboundBuffer.addFlush();
flush0();
}
private void flush0() {
if (!inFlushNow) { // Avoid re-entrance if (!inFlushNow) { // Avoid re-entrance
// Flush immediately only when there's no pending flush. // Flush immediately only when there's no pending flush.
// If there's a pending flush operation, event loop will call flushNow() later, // If there's a pending flush operation, event loop will call flushNow() later,
@ -609,7 +612,7 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
eventLoop().execute(new Runnable() { eventLoop().execute(new Runnable() {
@Override @Override
public void run() { public void run() {
flush(); flush0();
} }
}); });
} }