CustomConnectHandler: properly close

Author: jochen-testingbot

src/main/java/com/testingbot/tunnel/proxy/CustomConnectHandler.java

@@ -94,13 +94,14 @@ protected void connectToServer(HttpServletRequest request, String host, int port
 
     private void connectToProxy(HttpServletRequest request, String host, int port, Promise<SocketChannel> promise) {
         SocketChannel channel = null;
+        Selector selector = null;
         try {
             channel = SocketChannel.open();
             channel.socket().setTcpNoDelay(true);
             channel.configureBlocking(false);
             channel.connect(newConnectAddress(proxyHost, proxyPort));
 
-            final Selector selector = Selector.open();
+            selector = Selector.open();
             channel.register(selector, SelectionKey.OP_CONNECT);
             while (selector.select() > 0) {
                 final Set<SelectionKey> keys = selector.selectedKeys();
@@ -154,12 +155,7 @@ private void connectToProxy(HttpServletRequest request, String host, int port, P
                                     proxyHost, proxyPort, host, port);
                         }
 
-                        try {
-                            selector.close();
-                        } catch (final IOException e) {
-                            LOG.error("Error closing selector: {}", e.getMessage(), e);
-                        }
-
+                        selector.close();
                         promise.succeeded(channel);
                         return;
                     }
@@ -175,6 +171,13 @@ private void connectToProxy(HttpServletRequest request, String host, int port, P
                     LOG.error("Error closing channel after failure: {}", t.getMessage(), t);
                 }
             }
+            if (selector != null) {
+                try {
+                    selector.close();
+                } catch (IOException t) {
+                    LOG.error("Error closing selector after failure: {}", t.getMessage(), t);
+                }
+            }
             promise.failed(x);
         }
     }