From 568166d55454a079e558c66c35c867ac5ff7fcd7 Mon Sep 17 00:00:00 2001
From: Trustin Lee <t@motd.kr>
Date: Thu, 18 Jul 2013 10:29:34 +0900
Subject: [PATCH] Cleanup

---
 .../netty/channel/ChannelOutboundBuffer.java  | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java b/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java
index 9df4eb1558..c52794efd7 100644
--- a/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java
+++ b/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java
@@ -229,14 +229,7 @@ final class ChannelOutboundBuffer {
         final int size = unflushed.size();
         try {
             for (int i = 0; i < size; i++) {
-                safeRelease(messages[i]);
-
-                ChannelPromise p = promises[i];
-                if (!(p instanceof VoidChannelPromise)) {
-                    if (!p.tryFailure(cause)) {
-                        logger.warn("Promise done already: {} - new exception is:", p, cause);
-                    }
-                }
+                safeRelease(messages[i], promises[i], cause);
             }
         } finally {
             unflushed.recycle();
@@ -279,12 +272,7 @@ final class ChannelOutboundBuffer {
                     final int size = current.size();
                     try {
                         for (int i = currentMessageIndex; i < size; i++) {
-                            safeRelease(messages[i]);
-
-                            ChannelPromise p = promises[i];
-                            if (!(p instanceof VoidChannelPromise) && !p.tryFailure(cause)) {
-                                logger.warn("Promise done already: {} - new exception is:", p, cause);
-                            }
+                            safeRelease(messages[i], promises[i], cause);
                         }
                     } finally {
                         current.recycle();
@@ -296,11 +284,16 @@ final class ChannelOutboundBuffer {
         }
     }
 
-    private static void safeRelease(Object message) {
+    private static void safeRelease(Object message, ChannelPromise promise, Throwable cause) {
         try {
             ReferenceCountUtil.release(message);
         } catch (Throwable t) {
             logger.warn("Failed to release a message.", t);
         }
+
+        ChannelPromise p = promise;
+        if (!(p instanceof VoidChannelPromise) && !p.tryFailure(cause)) {
+            logger.warn("Promise done already: {} - new exception is:", p, cause);
+        }
     }
 }