Ensure the remote webdriver builder closes the httpclient

Author: shs96c

java/client/src/org/openqa/selenium/remote/RemoteWebDriverBuilder.java

@@ -28,13 +28,15 @@
 import org.openqa.selenium.internal.Either;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.http.ClientConfig;
+import org.openqa.selenium.remote.http.Filter;
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpHandler;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.service.DriverService;
 
 import java.io.ByteArrayInputStream;
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URI;
@@ -55,8 +57,10 @@
 import java.util.stream.StreamSupport;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.logging.Level.WARNING;
 import static org.openqa.selenium.internal.Debug.getDebugLogLevel;
 import static org.openqa.selenium.remote.DriverCommand.QUIT;
+import static org.openqa.selenium.remote.http.HttpMethod.DELETE;
 
 /**
  * Create a new Selenium session using the W3C WebDriver protocol. This class will not generate any
@@ -325,8 +329,11 @@ private WebDriver getRemoteDriver() {
       driverClientConfig = driverClientConfig.baseUri(baseUri);
     }
 
-    HttpHandler handler = Require.nonNull("Http handler", handlerFactory.apply(driverClientConfig))
-      .with(new AddWebDriverSpecHeaders().andThen(new ErrorFilter()));
+    HttpHandler client = handlerFactory.apply(driverClientConfig);
+    HttpHandler handler = Require.nonNull("Http handler", client)
+      .with(new CloseHttpClientFilter(client)
+        .andThen(new AddWebDriverSpecHeaders())
+        .andThen(new ErrorFilter()));
 
     byte[] payload = getPayloadUtf8Bytes();
     Either<ProtocolHandshake.Result, String> result = new ProtocolHandshake().createSession(
@@ -442,4 +449,34 @@ private byte[] getPayloadUtf8Bytes() {
       throw new SessionNotCreatedException("Unable to create session roughPayload", e);
     }
   }
+
+  private static class CloseHttpClientFilter implements Filter {
+
+    private final HttpHandler client;
+
+    CloseHttpClientFilter(HttpHandler client) {
+      this.client = Require.nonNull("Http client", client);
+    }
+
+    @Override
+    public HttpHandler apply(HttpHandler next) {
+      return req -> {
+        try {
+          return next.execute(req);
+        } finally {
+          if (req.getMethod() == DELETE && client instanceof Closeable) {
+            HttpSessionId.getSessionId(req.getUri()).ifPresent(id -> {
+              if (("/session/" + id).equals(req.getUri())) {
+                try {
+                  ((Closeable) client).close();
+                } catch (IOException e) {
+                  LOG.log(WARNING, "Exception swallowed while closing http client", e);
+                }
+              }
+            });
+          }
+        }
+      };
+    }
+  }
 }

java/client/src/org/openqa/selenium/remote/http/HttpClient.java

@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.remote.http;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ServiceLoader;
@@ -31,7 +32,7 @@
 /**
  * Defines a simple client for making HTTP requests.
  */
-public interface HttpClient extends HttpHandler {
+public interface HttpClient extends Closeable, HttpHandler {
 
   WebSocket openSocket(HttpRequest request, WebSocket.Listener listener);