From 4979cb6a219abc529850c1b451c0b0e221574b1d Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Wed, 4 Mar 2009 13:50:19 +0000
Subject: [PATCH] A little bit of code clean up

---
 .../netty/handler/codec/http/HttpMessageDecoder.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
index 0e012c26a0..8d199996f1 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
@@ -97,13 +97,15 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
             readInitial(buffer);
         }
         case READ_HEADER: {
-            readHeaders(buffer);
-            if (message.isChunked()) {
-                checkpoint(State.READ_CHUNK_SIZE);
+            State nextState = readHeaders(buffer);
+            checkpoint(nextState);
+            if (nextState == State.READ_CHUNK_SIZE) {
+                // Chunked encoding
                 if (!mergeChunks) {
                     return message;
                 }
             } else {
+                // Not a chunked encoding
                 int contentLength = message.getContentLength(-1);
                 if (contentLength == 0 || contentLength == -1 && isDecodingRequest()) {
                     content = ChannelBuffers.EMPTY_BUFFER;
@@ -224,7 +226,7 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
         }
     }
 
-    private void readHeaders(ChannelBuffer buffer) {
+    private State readHeaders(ChannelBuffer buffer) {
         message.clearHeaders();
         String line = readIntoCurrentLine(buffer);
         String lastHeader = null;
@@ -252,7 +254,7 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
         } else {
             nextState = State.READ_VARIABLE_LENGTH_CONTENT;
         }
-        checkpoint(nextState);
+        return nextState;
     }
 
     protected abstract boolean isDecodingRequest();