[java] limit the join

SeleniumHQ · Jan 10, 2024 · 3fd70c4 · 3fd70c4
1 parent 9905e7b
commit 3fd70c4
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/java/src/org/openqa/selenium/os/ExternalProcess.java b/java/src/org/openqa/selenium/os/ExternalProcess.java
@@ -295,8 +295,8 @@ public void shutdown(Duration timeout) {
 
       try {
         if (process.waitFor(timeout.toMillis(), MILLISECONDS)) {
-          worker.join();
-          return;
+          worker.join(8000);
+          worker.interrupt();
         }
       } catch (InterruptedException ex) {
         Thread.interrupted();
@@ -305,7 +305,8 @@ public void shutdown(Duration timeout) {
 
     process.destroyForcibly();
     try {
-      worker.join();
+      worker.join(8000);
+      worker.interrupt();
     } catch (InterruptedException ex) {
       Thread.interrupted();
     }