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

Merge pull request #637 from losipiuk/3

Browse Source 
Call ChunkedWriteHandler.flush() once again if tried when locked.
This commit is contained in:
Norman Maurer 2012-10-04 02:54:31 -07:00
commit 4bca91786a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
View File

@ -84,6 +84,7 @@ public class ChunkedWriteHandler
private volatile ChannelHandlerContext ctx;
private final AtomicBoolean flush = new AtomicBoolean(false);
private MessageEvent currentEvent;
private volatile boolean flushNeeded;
/**
* Continues to fetch the chunks from the input.
@ -187,9 +188,10 @@ public class ChunkedWriteHandler
boolean acquired = false;
final Channel channel = ctx.getChannel();
boolean suspend = false;
flushNeeded = true;
// use CAS to see if the have flush already running, if so we don't need to take futher actions
if (acquired = flush.compareAndSet(false, true)) {
flushNeeded = false;
try {
if (!channel.isConnected()) {
@ -297,7 +299,7 @@ public class ChunkedWriteHandler
}
if (acquired && (!channel.isConnected() || channel.isWritable() && !queue.isEmpty() && !suspend)) {
if (acquired && ((!channel.isConnected() || channel.isWritable() && !queue.isEmpty() && !suspend) || flushNeeded)) {
flush(ctx, fireNow);
}
}