From c25fd78ca00402282162ace98209a909f7326807 Mon Sep 17 00:00:00 2001
From: Trustin Lee <t@motd.kr>
Date: Thu, 4 Apr 2013 14:44:52 +0900
Subject: [PATCH] No need to have nested try blocks

.. because the catch block catches everything and rethrows it
---
 .../handler/codec/ByteToMessageDecoder.java   | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 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
index 2699e7dcbd..e1bbf63166 100644
--- a/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java
+++ b/codec/src/main/java/io/netty/handler/codec/ByteToMessageDecoder.java
@@ -109,35 +109,33 @@ public abstract class ByteToMessageDecoder
         OutputMessageBuf out = OutputMessageBuf.get();
         try {
             while (in.isReadable()) {
-                try {
-                    int outSize = out.size();
-                    int oldInputLength = in.readableBytes();
-                    decode(ctx, in, out);
-                    if (outSize == out.size()) {
-                        wasNull = true;
-                        if (oldInputLength == in.readableBytes()) {
-                            break;
-                        } else {
-                            continue;
-                        }
-                    }
-
-                    wasNull = false;
+                int outSize = out.size();
+                int oldInputLength = in.readableBytes();
+                decode(ctx, in, out);
+                if (outSize == out.size()) {
+                    wasNull = true;
                     if (oldInputLength == in.readableBytes()) {
-                        throw new IllegalStateException(
-                             "decode() did not read anything but decoded a message.");
-                    }
-
-                    if (isSingleDecode()) {
                         break;
-                    }
-                } catch (Throwable t) {
-                    if (t instanceof CodecException) {
-                        throw (CodecException) t;
                     } else {
-                        throw new DecoderException(t);
+                        continue;
                     }
                 }
+
+                wasNull = false;
+                if (oldInputLength == in.readableBytes()) {
+                    throw new IllegalStateException(
+                         "decode() did not read anything but decoded a message.");
+                }
+
+                if (isSingleDecode()) {
+                    break;
+                }
+            }
+        } catch (Throwable t) {
+            if (t instanceof CodecException) {
+                throw (CodecException) t;
+            } else {
+                throw new DecoderException(t);
             }
         } finally {
             if (out.drainToNextInbound(ctx)) {