From 7d31943326175581680192357a21d34e75a87b0c Mon Sep 17 00:00:00 2001
From: Norman Maurer <nmaurer@redhat.com>
Date: Sun, 11 Aug 2013 21:37:43 +0200
Subject: [PATCH] Remove some dead code

---
 .../io/netty/handler/codec/MessageToByteEncoder.java   | 10 ++++------
 .../handler/codec/compression/JdkZlibEncoder.java      |  5 ++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/codec/src/main/java/io/netty/handler/codec/MessageToByteEncoder.java b/codec/src/main/java/io/netty/handler/codec/MessageToByteEncoder.java
index d1ff1aee5b..f6c506b237 100644
--- a/codec/src/main/java/io/netty/handler/codec/MessageToByteEncoder.java
+++ b/codec/src/main/java/io/netty/handler/codec/MessageToByteEncoder.java
@@ -102,12 +102,10 @@ public abstract class MessageToByteEncoder<I> extends ChannelOutboundHandlerAdap
             if (acceptOutboundMessage(msg)) {
                 @SuppressWarnings("unchecked")
                 I cast = (I) msg;
-                if (buf == null) {
-                    if (preferDirect) {
-                        buf = ctx.alloc().ioBuffer();
-                    } else {
-                        buf = ctx.alloc().heapBuffer();
-                    }
+                if (preferDirect) {
+                    buf = ctx.alloc().ioBuffer();
+                } else {
+                    buf = ctx.alloc().heapBuffer();
                 }
                 try {
                     encode(ctx, cast, buf);
diff --git a/codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java b/codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java
index 518b06bbde..d0fa3f0b0c 100644
--- a/codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java
+++ b/codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java
@@ -190,13 +190,12 @@ public class JdkZlibEncoder extends ZlibEncoder {
     }
 
     @Override
-    protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) throws Exception {
+    protected void encode(ChannelHandlerContext ctx, ByteBuf uncompressed, ByteBuf out) throws Exception {
         if (finished) {
-            out.writeBytes(in);
+            out.writeBytes(uncompressed);
             return;
         }
 
-        ByteBuf uncompressed = in;
         byte[] inAry = new byte[uncompressed.readableBytes()];
         uncompressed.readBytes(inAry);