From 7e8a1cd9c221de5f759c594b3bbd67dd7755af6d Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Fri, 13 Feb 2009 08:55:06 +0000
Subject: [PATCH] Code cleanup

---
 .../netty/handler/codec/http/HttpMessageDecoder.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 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 f85b855bd0..0e012c26a0 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
@@ -191,9 +191,15 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
     }
 
     private Object reset() {
-        // TODO: Do we need to set message to null here?
+        HttpMessage message = this.message;
+        ChannelBuffer content = this.content;
+        if (content == null) {
+            content = ChannelBuffers.EMPTY_BUFFER;
+        }
         message.setContent(content);
-        content = null;
+
+        this.message = null;
+        this.content = null;
         checkpoint(State.SKIP_CONTROL_CHARS);
         return message;
     }