[java] stop the started server when an exception is raised

SeleniumHQ · Jan 4, 2024 · cd91b8c · cd91b8c
1 parent f744519
commit cd91b8c
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/java/test/org/openqa/selenium/testing/drivers/RemoteSupplier.java b/java/test/org/openqa/selenium/testing/drivers/RemoteSupplier.java
@@ -57,9 +57,17 @@ public WebDriver get() {
       serverUrl = server.getWebDriverUrl();
     }
 
-    RemoteWebDriver driver = new RemoteWebDriver(serverUrl, desiredCapabilities);
-    driver.setFileDetector(new LocalFileDetector());
-    return new Augmenter().augment(driver);
+    try {
+      RemoteWebDriver driver = new RemoteWebDriver(serverUrl, desiredCapabilities);
+      driver.setFileDetector(new LocalFileDetector());
+      return new Augmenter().augment(driver);
+    } catch (Exception ex) {
+      if (started) {
+        started = false;
+        server.stop();
+      }
+      throw ex;
+    }
   }
 
   private synchronized void startServer() {