From df06536818d05f65055929108da09dd8b18159d3 Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Thu, 4 Jun 2009 06:15:19 +0000
Subject: [PATCH] Fixed test failure

---
 .../serialization/CompatibleObjectDecoder.java   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java
index 307d792670..e5aea1d669 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java
@@ -89,7 +89,7 @@ public class CompatibleObjectDecoder extends ReplayingDecoder<CompatibleObjectDe
     protected Object decode(
             ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer, CompatibleObjectDecoderState state) throws Exception {
         bin.switchStream(new ChannelBufferInputStream(buffer));
-
+        System.out.println(buffer);
         switch (state) {
         case READ_HEADER:
             oin = newObjectInputStream(bin);
@@ -105,12 +105,16 @@ public class CompatibleObjectDecoder extends ReplayingDecoder<CompatibleObjectDe
     protected Object decodeLast(ChannelHandlerContext ctx, Channel channel,
             ChannelBuffer buffer, CompatibleObjectDecoderState state)
             throws Exception {
-        // Ignore the last TC_RESET
-        if (buffer.readableBytes() == 1 &&
-            buffer.getByte(buffer.readerIndex()) == ObjectStreamConstants.TC_RESET) {
-            buffer.skipBytes(1);
-            oin.close();
+        switch (buffer.readableBytes()) {
+        case 0:
             return null;
+        case 1:
+            // Ignore the last TC_RESET
+            if (buffer.getByte(buffer.readerIndex()) == ObjectStreamConstants.TC_RESET) {
+                buffer.skipBytes(1);
+                oin.close();
+                return null;
+            }
         }
 
         Object decoded =  decode(ctx, channel, buffer, state);