Fix a bug in shutdownOutput() implementations where wrong ChannelFuture is notified

testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java

@@ -57,7 +57,7 @@ public class SocketShutdownOutputBySelfTest extends AbstractClientSocketTest {
             assertFalse(h.ch.isOutputShutdown());
 
             // Make the connection half-closed and ensure read() returns -1.
-            ch.shutdownOutput();
+            ch.shutdownOutput().sync();
             assertEquals(-1, s.getInputStream().read());
 
             assertTrue(h.ch.isOpen());

transport/src/main/java/io/netty/channel/socket/aio/AioSocketChannel.java

@@ -110,27 +110,31 @@ public class AioSocketChannel extends AbstractAioChannel implements SocketChanne
 
     @Override
     public ChannelFuture shutdownOutput() {
-        ChannelFuture future = newFuture();
+        final ChannelFuture future = newFuture();
         EventLoop loop = eventLoop();
         if (loop.inEventLoop()) {
-            try {
+            shutdownOutput(future);
-                javaChannel().shutdownOutput();
-                outputShutdown = true;
-                future.setSuccess();
-            } catch (Throwable t) {
-                future.setFailure(t);
-            }
         } else {
             loop.execute(new Runnable() {
                 @Override
                 public void run() {
-                    shutdownOutput();
+                    shutdownOutput(future);
                 }
             });
         }
         return future;
     }
 
+    private void shutdownOutput(ChannelFuture future) {
+        try {
+            javaChannel().shutdownOutput();
+            outputShutdown = true;
+            future.setSuccess();
+        } catch (Throwable t) {
+            future.setFailure(t);
+        }
+    }
+
     @Override
     protected void doConnect(SocketAddress remoteAddress, SocketAddress localAddress, final ChannelFuture future) {
         if (localAddress != null) {

transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java

@@ -110,26 +110,30 @@ public class NioSocketChannel extends AbstractNioByteChannel implements io.netty
 
     @Override
     public ChannelFuture shutdownOutput() {
-        ChannelFuture future = newFuture();
+        final ChannelFuture future = newFuture();
         EventLoop loop = eventLoop();
         if (loop.inEventLoop()) {
-            try {
+            shutdownOutput(future);
-                javaChannel().socket().shutdownOutput();
-                future.setSuccess();
-            } catch (Throwable t) {
-                future.setFailure(t);
-            }
         } else {
             loop.execute(new Runnable() {
                 @Override
                 public void run() {
-                    shutdownOutput();
+                    shutdownOutput(future);
                 }
             });
         }
         return future;
     }
 
+    private void shutdownOutput(ChannelFuture future) {
+        try {
+            javaChannel().socket().shutdownOutput();
+            future.setSuccess();
+        } catch (Throwable t) {
+            future.setFailure(t);
+        }
+    }
+
     @Override
     protected SocketAddress localAddress0() {
         return javaChannel().socket().getLocalSocketAddress();

transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java

@@ -115,26 +115,30 @@ public class OioSocketChannel extends AbstractOioByteChannel
 
     @Override
     public ChannelFuture shutdownOutput() {
-        ChannelFuture future = newFuture();
+        final ChannelFuture future = newFuture();
         EventLoop loop = eventLoop();
         if (loop.inEventLoop()) {
-            try {
+            shutdownOutput(future);
-                socket.shutdownOutput();
-                future.setSuccess();
-            } catch (Throwable t) {
-                future.setFailure(t);
-            }
         } else {
             loop.execute(new Runnable() {
                 @Override
                 public void run() {
-                    shutdownOutput();
+                    shutdownOutput(future);
                 }
             });
         }
         return future;
     }
 
+    private void shutdownOutput(ChannelFuture future) {
+        try {
+            socket.shutdownOutput();
+            future.setSuccess();
+        } catch (Throwable t) {
+            future.setFailure(t);
+        }
+    }
+
     @Override
     protected SocketAddress localAddress0() {
         return socket.getLocalSocketAddress();