From 58086a865f1b5592578392006c3efb6aafd2c884 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Thu, 7 Jan 2010 09:19:19 +0000 Subject: [PATCH] Code clean up --- .../codec/http/HttpMessageEncoder.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java index b9f693ca19..01581581ac 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java @@ -91,17 +91,19 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder { if (msg instanceof HttpChunk) { HttpChunk chunk = (HttpChunk) msg; if (chunked) { - if (chunk == HttpChunk.LAST_CHUNK) { + if (chunk.isLast()) { chunked = false; - return LAST_CHUNK.duplicate(); - } else if (chunk instanceof HttpChunkTrailer) { - ChannelBuffer trailer = ChannelBuffers.dynamicBuffer( - channel.getConfig().getBufferFactory()); - trailer.writeByte((byte) '0'); - trailer.writeBytes(CRLF); - encodeTrailingHeaders(trailer, (HttpChunkTrailer) chunk); - trailer.writeBytes(CRLF); - return trailer; + if (chunk instanceof HttpChunkTrailer) { + ChannelBuffer trailer = ChannelBuffers.dynamicBuffer( + channel.getConfig().getBufferFactory()); + trailer.writeByte((byte) '0'); + trailer.writeBytes(CRLF); + encodeTrailingHeaders(trailer, (HttpChunkTrailer) chunk); + trailer.writeBytes(CRLF); + return trailer; + } else { + return LAST_CHUNK.duplicate(); + } } else { ChannelBuffer content = chunk.getContent(); int contentLength = content.readableBytes(); @@ -115,7 +117,7 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder { wrappedBuffer(CRLF)); } } else { - if (chunk == HttpChunk.LAST_CHUNK) { + if (chunk.isLast()) { return null; } else { return chunk.getContent();