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

Fixed an infinite loop

Browse Source
This commit is contained in:
Trustin Lee 2010-02-18 04:29:58 +00:00
parent 4ef4a92281
commit 3412003bc2
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,10 +172,14 @@ public class ChunkedWriteHandler implements ChannelUpstreamHandler, ChannelDowns
ChunkedInput chunks = (ChunkedInput) m; ChunkedInput chunks = (ChunkedInput) m;
Object chunk; Object chunk;
boolean endOfInput; boolean endOfInput;
boolean later;
try { try {
chunk = chunks.nextChunk(); chunk = chunks.nextChunk();
if (chunk == null) { if (chunk == null) {
chunk = ChannelBuffers.EMPTY_BUFFER; chunk = ChannelBuffers.EMPTY_BUFFER;
later = true;
} else {
later = false;
} }
endOfInput = chunks.isEndOfInput(); endOfInput = chunks.isEndOfInput();
} catch (Throwable t) { } catch (Throwable t) {
@ -211,6 +215,12 @@ public class ChunkedWriteHandler implements ChannelUpstreamHandler, ChannelDowns
Channels.write( Channels.write(
ctx, writeFuture, chunk, ctx, writeFuture, chunk,
currentEvent.getRemoteAddress()); currentEvent.getRemoteAddress());
if (later) {
// ChunkedInput.nextChunk() returned null.
// Let's wait until more chunks arrive.
break;
}
} else { } else {
ctx.sendDownstream(currentEvent); ctx.sendDownstream(currentEvent);
currentEvent = null; currentEvent = null;