Ensure closing a Socket / FileDescriptor multiple times will not throw exception

Motivation:

If an user will close a Socket / FileDescriptor multiple times we should handle the extra close operations as NOOP.

Modifications:

Only do the actual closing one time

Result:

No exception if close is called multiple times.

transport-native-epoll/src/main/java/io/netty/channel/unix/FileDescriptor.java

@@ -15,9 +15,12 @@
  */
 package io.netty.channel.unix;
 
+import io.netty.util.internal.PlatformDependent;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
 import static io.netty.channel.unix.Errors.CONNECTION_RESET_EXCEPTION_READ;
 import static io.netty.channel.unix.Errors.CONNECTION_RESET_EXCEPTION_WRITE;
@@ -31,8 +34,18 @@ import static io.netty.util.internal.ObjectUtil.checkNotNull;
  * {@link FileDescriptor} for it.
  */
 public class FileDescriptor {
+    private static final AtomicIntegerFieldUpdater<FileDescriptor> openUpdater;
+    static {
+        AtomicIntegerFieldUpdater<FileDescriptor> updater
+                = PlatformDependent.newAtomicIntegerFieldUpdater(FileDescriptor.class, "open");
+        if (updater == null) {
+            updater = AtomicIntegerFieldUpdater.newUpdater(FileDescriptor.class, "open");
+        }
+        openUpdater = updater;
+    }
+
     private final int fd;
-    private volatile boolean open = true;
+    private volatile int open = 1;
 
     public FileDescriptor(int fd) {
         if (fd < 0) {
@@ -52,10 +65,11 @@ public class FileDescriptor {
      * Close the file descriptor.
      */
     public void close() throws IOException {
-        open = false;
+        if (openUpdater.compareAndSet(this, 1, 0)) {
-        int res = close(fd);
+            int res = close(fd);
-        if (res < 0) {
+            if (res < 0) {
-            throw newIOException("close", res);
+                throw newIOException("close", res);
+            }
         }
     }
 
@@ -63,7 +77,7 @@ public class FileDescriptor {
      * Returns {@code true} if the file descriptor is open.
      */
     public boolean isOpen() {
-        return open;
+        return open == 1;
     }
 
     public final int write(ByteBuffer buf, int pos, int limit) throws IOException {

transport-native-epoll/src/test/java/io/netty/channel/unix/SocketTest.java

@@ -44,80 +44,56 @@ public class SocketTest {
 
     @Test
     public void testKeepAlive() throws Exception {
-        Socket socket = Socket.newSocketStream();
+        assertFalse(socket.isKeepAlive());
-        try {
+        socket.setKeepAlive(true);
-            assertFalse(socket.isKeepAlive());
+        assertTrue(socket.isKeepAlive());
-            socket.setKeepAlive(true);
-            assertTrue(socket.isKeepAlive());
-        } finally {
-            socket.close();
-        }
     }
 
     @Test
     public void testTcpCork() throws Exception {
-        Socket socket = Socket.newSocketStream();
+        assertFalse(socket.isTcpCork());
-        try {
+        socket.setTcpCork(true);
-            assertFalse(socket.isTcpCork());
+        assertTrue(socket.isTcpCork());
-            socket.setTcpCork(true);
-            assertTrue(socket.isTcpCork());
-        } finally {
-            socket.close();
-        }
     }
 
     @Test
     public void testTcpNoDelay() throws Exception {
-        Socket socket = Socket.newSocketStream();
+        assertFalse(socket.isTcpNoDelay());
-        try {
+        socket.setTcpNoDelay(true);
-            assertFalse(socket.isTcpNoDelay());
+        assertTrue(socket.isTcpNoDelay());
-            socket.setTcpNoDelay(true);
-            assertTrue(socket.isTcpNoDelay());
-        } finally {
-            socket.close();
-        }
     }
 
     @Test
     public void testReceivedBufferSize() throws Exception {
-        Socket socket = Socket.newSocketStream();
+        int size = socket.getReceiveBufferSize();
-        try {
+        int newSize = 65535;
-            int size = socket.getReceiveBufferSize();
+        assertTrue(size > 0);
-            int newSize = 65535;
+        socket.setReceiveBufferSize(newSize);
-            assertTrue(size > 0);
+        // Linux usually set it to double what is specified
-            socket.setReceiveBufferSize(newSize);
+        assertTrue(newSize <= socket.getReceiveBufferSize());
-            // Linux usually set it to double what is specified
-            assertTrue(newSize <= socket.getReceiveBufferSize());
-        } finally {
-            socket.close();
-        }
     }
 
     @Test
     public void testSendBufferSize() throws Exception {
-        Socket socket = Socket.newSocketStream();
+        int size = socket.getSendBufferSize();
-        try {
+        int newSize = 65535;
-            int size = socket.getSendBufferSize();
+        assertTrue(size > 0);
-            int newSize = 65535;
+        socket.setSendBufferSize(newSize);
-            assertTrue(size > 0);
+        // Linux usually set it to double what is specified
-            socket.setSendBufferSize(newSize);
+        assertTrue(newSize <= socket.getSendBufferSize());
-            // Linux usually set it to double what is specified
-            assertTrue(newSize <= socket.getSendBufferSize());
-        } finally {
-            socket.close();
-        }
     }
 
     @Test
     public void testSoLinger() throws Exception {
+        assertEquals(-1, socket.getSoLinger());
+        socket.setSoLinger(10);
+        assertEquals(10, socket.getSoLinger());
+    }
+
+    @Test
+    public void testDoubleCloseDoesNotThrow() throws IOException {
         Socket socket = Socket.newSocketStream();
-        try {
+        socket.close();
-            assertEquals(-1, socket.getSoLinger());
+        socket.close();
-            socket.setSoLinger(10);
-            assertEquals(10, socket.getSoLinger());
-        } finally {
-            socket.close();
-        }
     }
 }
-