Fix UDP Multicast writes. See netty#237

shijinkui · Apr 2, 2012 · b350e8d · b350e8d
1 parent 9b90e31
commit b350e8d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/AbstractNioChannel.java
@@ -20,7 +20,6 @@
 import io.netty.channel.AbstractChannel;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFactory;
-import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelSink;
 import io.netty.channel.MessageEvent;
@@ -29,7 +28,6 @@
 import io.netty.util.internal.ThreadLocalBoolean;
 
 import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Queue;
@@ -168,15 +166,6 @@ void setRawInterestOpsNow(int interestOps) {
         super.setInterestOpsNow(interestOps);
     }
 
-    @Override
-    public ChannelFuture write(Object message, SocketAddress remoteAddress) {
-        if (remoteAddress == null || remoteAddress.equals(getRemoteAddress())) {
-            return super.write(message, null);
-        } else {
-            return getUnsupportedOperationFuture();
-        }
-    }
-
     @Override
     public int getInterestOps() {
         if (!isOpen()) {

diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java
@@ -273,7 +273,7 @@ public ChannelFuture write(Object message, SocketAddress remoteAddress) {
         if (remoteAddress == null || remoteAddress.equals(getRemoteAddress())) {
             return super.write(message, null);
         } else {
-            return super.write(message, remoteAddress);
+            return Channels.write(this, message, remoteAddress);
         }
 
     }

diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java
@@ -17,9 +17,11 @@
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelSink;
 
+import java.net.SocketAddress;
 import java.nio.channels.SocketChannel;
 
 public abstract class NioSocketChannel extends AbstractNioChannel implements io.netty.channel.socket.SocketChannel {
@@ -82,4 +84,15 @@ protected boolean setClosed() {
         state = ST_CLOSED;
         return super.setClosed();
     }
+
+
+    @Override
+    public ChannelFuture write(Object message, SocketAddress remoteAddress) {
+        if (remoteAddress == null || remoteAddress.equals(getRemoteAddress())) {
+            return super.write(message, null);
+        } else {
+            return getUnsupportedOperationFuture();
+        }
+    }
+
 }