From 392623749eaadbbb4169103480971fac0b635784 Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Wed, 30 May 2012 02:01:48 -0700
Subject: [PATCH] Fix compilation errors

---
 .../channel/socket/oio/AbstractOioMessageChannel.java      | 6 ++----
 .../netty/channel/socket/oio/AbstractOioStreamChannel.java | 7 ++-----
 .../io/netty/channel/socket/oio/OioDatagramChannel.java    | 5 ++---
 .../netty/channel/socket/oio/OioServerSocketChannel.java   | 2 +-
 .../java/io/netty/channel/socket/oio/OioSocketChannel.java | 6 ++----
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioMessageChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioMessageChannel.java
index 78bfcb3614..45c95526fe 100644
--- a/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioMessageChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioMessageChannel.java
@@ -10,15 +10,13 @@ import java.util.Queue;
 
 abstract class AbstractOioMessageChannel extends AbstractOioChannel {
 
-    private final ChannelBufferHolder<Object> firstOut = ChannelBufferHolders.messageBuffer();
-
     protected AbstractOioMessageChannel(Channel parent, Integer id) {
         super(parent, id);
     }
 
     @Override
-    protected ChannelBufferHolder<Object> firstOut() {
-        return firstOut;
+    protected ChannelBufferHolder<?> newOutboundBuffer() {
+        return ChannelBufferHolders.messageBuffer();
     }
 
     @Override
diff --git a/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioStreamChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioStreamChannel.java
index f06e03e9f0..e9bd2fe440 100644
--- a/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioStreamChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/oio/AbstractOioStreamChannel.java
@@ -10,16 +10,13 @@ import java.io.IOException;
 
 abstract class AbstractOioStreamChannel extends AbstractOioChannel {
 
-    private final ChannelBufferHolder<?> firstOut = ChannelBufferHolders.byteBuffer();
-
     protected AbstractOioStreamChannel(Channel parent, Integer id) {
         super(parent, id);
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    protected ChannelBufferHolder<Object> firstOut() {
-        return (ChannelBufferHolder<Object>) firstOut;
+    protected ChannelBufferHolder<?> newOutboundBuffer() {
+        return ChannelBufferHolders.byteBuffer();
     }
 
     @Override
diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java
index 290056ace2..6262f4374e 100644
--- a/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java
@@ -47,7 +47,6 @@ public class OioDatagramChannel extends AbstractOioMessageChannel
 
     private final MulticastSocket socket;
     private final DatagramChannelConfig config;
-    private final ChannelBufferHolder<Object> out = ChannelBufferHolders.messageBuffer();
     private final java.net.DatagramPacket tmpPacket = new java.net.DatagramPacket(EMPTY_DATA, 0);
 
     private static MulticastSocket newSocket() {
@@ -103,8 +102,8 @@ public class OioDatagramChannel extends AbstractOioMessageChannel
     }
 
     @Override
-    protected ChannelBufferHolder<Object> firstOut() {
-        return out;
+    protected ChannelBufferHolder<?> newOutboundBuffer() {
+        return ChannelBufferHolders.messageBuffer();
     }
 
     @Override
diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java
index bf42590a01..98fd4bb1bb 100644
--- a/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java
@@ -161,7 +161,7 @@ public class OioServerSocketChannel extends AbstractOioMessageChannel
     }
 
     @Override
-    protected ChannelBufferHolder<Object> firstOut() {
+    protected ChannelBufferHolder<?> newOutboundBuffer() {
         return ChannelBufferHolders.discardBuffer();
     }
 
diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java
index 2a95a0f8f7..8d243dadc8 100644
--- a/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java
@@ -42,7 +42,6 @@ public class OioSocketChannel extends AbstractOioStreamChannel
 
     private final Socket socket;
     private final SocketChannelConfig config;
-    private final ChannelBufferHolder<?> out = ChannelBufferHolders.byteBuffer();
     private InputStream is;
     private OutputStream os;
 
@@ -96,9 +95,8 @@ public class OioSocketChannel extends AbstractOioStreamChannel
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    protected ChannelBufferHolder<Object> firstOut() {
-        return (ChannelBufferHolder<Object>) out;
+    protected ChannelBufferHolder<?> newOutboundBuffer() {
+        return ChannelBufferHolders.byteBuffer();
     }
 
     @Override