[grid] close the httpclient after connecting the websocket failed

Author: joerg1985

java/src/org/openqa/selenium/grid/node/ProxyNodeWebsockets.java

@@ -226,24 +226,30 @@ private Consumer<Message> createWsEndPoint(
     LOG.info("Establishing connection to " + uri);
 
     HttpClient client = clientFactory.createClient(ClientConfig.defaultConfig().baseUri(uri));
-    WebSocket upstream =
-        client.openSocket(
-            new HttpRequest(GET, uri.toString()),
-            new ForwardingListener(downstream, sessionConsumer, sessionId));
+    try {
+      WebSocket upstream =
+          client.openSocket(
+              new HttpRequest(GET, uri.toString()),
+              new ForwardingListener(downstream, sessionConsumer, sessionId));
 
-    return (msg) -> {
-      try {
-        upstream.send(msg);
-      } finally {
-        if (msg instanceof CloseMessage) {
-          try {
-            client.close();
-          } catch (Exception e) {
-            LOG.log(Level.WARNING, "Failed to shutdown the client of " + uri, e);
+      return (msg) -> {
+        try {
+          upstream.send(msg);
+        } finally {
+          if (msg instanceof CloseMessage) {
+            try {
+              client.close();
+            } catch (Exception e) {
+              LOG.log(Level.WARNING, "Failed to shutdown the client of " + uri, e);
+            }
           }
         }
-      }
-    };
+      };
+    } catch (Exception e) {
+      LOG.log(Level.WARNING, "Connecting to upstream websocket failed", e);
+      client.close();
+      throw e;
+    }
   }
 
   private static class ForwardingListener implements WebSocket.Listener {

java/src/org/openqa/selenium/grid/router/ProxyWebsocketsIntoGrid.java

@@ -68,24 +68,29 @@ public Optional<Consumer<Message>> apply(String uri, Consumer<Message> downstrea
 
       HttpClient client =
           clientFactory.createClient(ClientConfig.defaultConfig().baseUri(sessionUri));
-      WebSocket upstream =
-          client.openSocket(new HttpRequest(GET, uri), new ForwardingListener(downstream));
-
-      return Optional.of(
-          (msg) -> {
-            try {
-              upstream.send(msg);
-            } finally {
-              if (msg instanceof CloseMessage) {
-                try {
-                  client.close();
-                } catch (Exception e) {
-                  LOG.log(Level.WARNING, "Failed to shutdown the client of " + sessionUri, e);
+      try {
+        WebSocket upstream =
+            client.openSocket(new HttpRequest(GET, uri), new ForwardingListener(downstream));
+
+        return Optional.of(
+            (msg) -> {
+              try {
+                upstream.send(msg);
+              } finally {
+                if (msg instanceof CloseMessage) {
+                  try {
+                    client.close();
+                  } catch (Exception e) {
+                    LOG.log(Level.WARNING, "Failed to shutdown the client of " + sessionUri, e);
+                  }
                 }
               }
-            }
-          });
-
+            });
+      } catch (Exception e) {
+        LOG.log(Level.WARNING, "Connecting to upstream websocket failed", e);
+        client.close();
+        return Optional.empty();
+      }
     } catch (NoSuchSessionException e) {
       LOG.warning("Attempt to connect to non-existent session: " + uri);
       return Optional.empty();