cp: timeout

Author: shs96c

java/server/src/org/openqa/selenium/remote/server/DriverServlet.java

@@ -108,6 +108,11 @@ public void init() throws ServletException {
           inactiveSessionTimeoutMs,
           individualCommandTimeoutMs);
     }
+
+    // Alright. It's nonsense that the individualCommandTimeout isn't a sensible value.
+    if (individualCommandTimeoutMs == 0) {
+      individualCommandTimeoutMs = Math.min(inactiveSessionTimeoutMs, Long.MAX_VALUE);
+    }
   }
 
   @VisibleForTesting
@@ -289,8 +294,7 @@ protected void handleRequest(
       }
     });
     try {
-      long timeout = individualCommandTimeoutMs == 0 ? Long.MAX_VALUE : individualCommandTimeoutMs;
-      future.get(timeout, MILLISECONDS);
+      future.get(getIndividualCommandTimeoutMs(), MILLISECONDS);
     } catch (InterruptedException e) {
       writeThrowable(servletResponse, e);
     } catch (ExecutionException e) {