From 75ce548edaac3a21fa7d2e0ad78d2b58f29d1b0f Mon Sep 17 00:00:00 2001
From: norman <norman@apache.org>
Date: Tue, 20 Mar 2012 11:32:18 +0100
Subject: [PATCH] Add missing changes from the master branch

---
 .../netty/channel/socket/nio/AbstractNioChannel.java     | 9 +++++++++
 .../netty/channel/socket/nio/NioDatagramChannel.java     | 8 ++++++--
 .../jboss/netty/channel/socket/nio/NioSocketChannel.java | 4 ++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioChannel.java
index 56a6ddaeb3..e801e1f4f8 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioChannel.java
@@ -115,6 +115,15 @@ abstract class AbstractNioChannel<C extends SelectableChannel & WritableByteChan
         this.channel = ch;
     }
 
+    /**
+     * Return the {@link AbstractNioWorker} that handle the IO of the
+     * {@link AbstractNioChannel}
+     * 
+     * @return worker
+     */
+    public AbstractNioWorker getWorker() {
+        return worker;
+    }
     public InetSocketAddress getLocalAddress() {
         InetSocketAddress localAddress = this.localAddress;
         if (localAddress == null) {
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
index 246fd016dd..dcadca62b3 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
@@ -33,7 +33,7 @@ import java.nio.channels.DatagramChannel;
 /**
  * Provides an NIO based {@link io.netty.channel.socket.DatagramChannel}.
  */
-final class NioDatagramChannel extends AbstractNioChannel<DatagramChannel>
+public final class NioDatagramChannel extends AbstractNioChannel<DatagramChannel>
                                 implements org.jboss.netty.channel.socket.DatagramChannel {
 
     /**
@@ -61,7 +61,11 @@ final class NioDatagramChannel extends AbstractNioChannel<DatagramChannel>
         }
     }
 
-
+    @Override
+    public NioDatagramWorker getWorker() {
+        return (NioDatagramWorker) super.getWorker();
+    }
+    
     public boolean isBound() {
         return isOpen() && channel.socket().isBound();
     }
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java
index c030d8e943..e81a375bfc 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java
@@ -43,6 +43,10 @@ class NioSocketChannel extends AbstractNioChannel<SocketChannel>
         config = new DefaultNioSocketChannelConfig(socket.socket());
     }
 
+    @Override
+    public NioWorker getWorker() {
+        return (NioWorker) super.getWorker();
+    }
 
     public NioSocketChannelConfig getConfig() {
         return config;