Interpreting zero timeout value as "infinite" (actually, max long)

SeleniumHQ · May 31, 2018 · bfd4dcc · bfd4dcc
1 parent 2c3aab2
commit bfd4dcc
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/java/server/src/org/openqa/selenium/remote/server/WebDriverServlet.java b/java/server/src/org/openqa/selenium/remote/server/WebDriverServlet.java
@@ -37,6 +37,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -75,10 +76,10 @@ public void init() {
     configureLogging();
     log("Initialising WebDriverServlet");
 
-    String value = getServletContext().getInitParameter(SESSION_TIMEOUT_PARAMETER);
-    long inactiveSessionTimeout = value != null ?
-                                  SECONDS.toMillis(Long.parseLong(value)) :
-                                  Long.MAX_VALUE;
+    long inactiveSessionTimeout = Optional.ofNullable(getServletContext().getInitParameter(SESSION_TIMEOUT_PARAMETER))
+        .map(value -> SECONDS.toMillis(Long.parseLong(value)))
+        .filter(value -> value > 0)
+        .orElse(Long.MAX_VALUE);
 
     allSessions = (ActiveSessions) getServletContext().getAttribute(ACTIVE_SESSIONS_KEY);
     if (allSessions == null) {