MINOR: Ensure that selection key is cancelled on close

Author: Rajini Sivaram <[email protected]> Reviewers: Ismael Juma <[email protected]> Closes apache#1368 from rajinisivaram/minor-channelclose
priyank5485 · May 11, 2016 · e20eba9 · e20eba9
1 parent 3e89d2b
commit e20eba9
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/clients/src/main/java/org/apache/kafka/common/network/PlaintextTransportLayer.java b/clients/src/main/java/org/apache/kafka/common/network/PlaintextTransportLayer.java
@@ -30,11 +30,8 @@
 import java.security.Principal;
 
 import org.apache.kafka.common.security.auth.KafkaPrincipal;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class PlaintextTransportLayer implements TransportLayer {
-    private static final Logger log = LoggerFactory.getLogger(PlaintextTransportLayer.class);
     private final SelectionKey key;
     private final SocketChannel socketChannel;
     private final Principal principal = KafkaPrincipal.ANONYMOUS;
@@ -84,10 +81,13 @@ public boolean isConnected() {
      */
     @Override
     public void close() throws IOException {
-        socketChannel.socket().close();
-        socketChannel.close();
-        key.attach(null);
-        key.cancel();
+        try {
+            socketChannel.socket().close();
+            socketChannel.close();
+        } finally {
+            key.attach(null);
+            key.cancel();
+        }
     }
 
     /**