Revert "[netty#1812] Rework ByteToMessageDecoder.channelRead(..) meth…

…od to allow for inlining" This reverts commit b7262ab.
gyk001 · Oct 23, 2013 · 3de7a0b · 3de7a0b
1 parent b7262ab
commit 3de7a0b
Showing 1 changed file with 45 additions and 38 deletions.
diff --git a/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java b/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java
@@ -121,55 +121,62 @@ protected void handlerRemoved0(ChannelHandlerContext ctx) throws Exception { }
 
     @Override
     public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-        if (msg instanceof ByteBuf) {
-            RecyclableArrayList out = RecyclableArrayList.newInstance();
-            try {
+        RecyclableArrayList out = RecyclableArrayList.newInstance();
+        try {
+            if (msg instanceof ByteBuf) {
                 ByteBuf data = (ByteBuf) msg;
                 if (cumulation == null) {
                     cumulation = data;
-                } else {
-                    if (cumulation.writerIndex() > cumulation.maxCapacity() - data.readableBytes()) {
-                        expandCumulation(ctx, data.readableBytes());
-                    }
-                    cumulation.writeBytes(data);
-                    data.release();
-                }
-                callDecode(ctx, cumulation, out);
-            } catch (DecoderException e) {
-                throw e;
-            } catch (Throwable t) {
-                throw new DecoderException(t);
-            } finally {
-                if (cumulation != null) {
-                    if (!cumulation.isReadable()) {
-                        cumulation.release();
-                        cumulation = null;
-                    } else {
-                        cumulation.discardSomeReadBytes();
+                    try {
+                        callDecode(ctx, cumulation, out);
+                    } finally {
+                        if (cumulation != null && !cumulation.isReadable()) {
+                            cumulation.release();
+                            cumulation = null;
+                        }
                     }
-                }
-                int size = out.size();
-                if (size == 0) {
-                    decodeWasNull = true;
                 } else {
-                    for (int i = 0; i < size; i ++) {
-                        ctx.fireChannelRead(out.get(i));
+                    try {
+                        if (cumulation.writerIndex() > cumulation.maxCapacity() - data.readableBytes()) {
+                            ByteBuf oldCumulation = cumulation;
+                            cumulation = ctx.alloc().buffer(oldCumulation.readableBytes() + data.readableBytes());
+                            cumulation.writeBytes(oldCumulation);
+                            oldCumulation.release();
+                        }
+                        cumulation.writeBytes(data);
+                        callDecode(ctx, cumulation, out);
+                    } finally {
+                        if (cumulation != null) {
+                            if (!cumulation.isReadable()) {
+                                cumulation.release();
+                                cumulation = null;
+                            } else {
+                                cumulation.discardSomeReadBytes();
+                            }
+                        }
+                        data.release();
                     }
                 }
-                out.recycle();
+            } else {
+                out.add(msg);
             }
-        } else {
-            ctx.fireChannelRead(msg);
+        } catch (DecoderException e) {
+            throw e;
+        } catch (Throwable t) {
+            throw new DecoderException(t);
+        } finally {
+            int size = out.size();
+            if (size == 0) {
+                decodeWasNull = true;
+            } else {
+                for (int i = 0; i < size; i ++) {
+                    ctx.fireChannelRead(out.get(i));
+                }
+            }
+            out.recycle();
         }
     }
 
-    private void expandCumulation(ChannelHandlerContext ctx, int readable) {
-        ByteBuf oldCumulation = cumulation;
-        cumulation = ctx.alloc().buffer(oldCumulation.readableBytes() + readable);
-        cumulation.writeBytes(oldCumulation);
-        oldCumulation.release();
-    }
-
     @Override
     public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
         if (decodeWasNull) {