Improving error messages if the driver server can't start in the given time, Fixes #4403

Author: barancev

java/client/src/org/openqa/selenium/net/UrlChecker.java

@@ -34,6 +34,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
 
@@ -97,7 +98,7 @@ public void waitUntilAvailable(long timeout, TimeUnit unit, final URL... urls)
           sleepMillis = (sleepMillis >= MAX_POLL_INTERVAL_MS) ? sleepMillis : sleepMillis * 2;
         }
       }, timeout, unit);
-    } catch (UncheckedTimeoutException e) {
+    } catch (UncheckedTimeoutException | java.util.concurrent.TimeoutException e) {
       throw new TimeoutException(String.format(
           "Timed out waiting for %s to be available after %d ms",
           Arrays.toString(urls), MILLISECONDS.convert(System.nanoTime() - start, NANOSECONDS)), e);

java/client/src/org/openqa/selenium/remote/service/DriverService.java

@@ -149,10 +149,7 @@ protected static void checkExecutable(File exe) {
   public boolean isRunning() {
     lock.lock();
     try {
-      if (process == null) {
-        return false;
-      }
-      return process.isRunning();
+      return process != null && process.isRunning();
     } catch (IllegalThreadStateException e) {
       return true;
     } finally {
@@ -189,7 +186,7 @@ protected void waitUntilAvailable() throws MalformedURLException {
       URL status = new URL(url.toString() + "/status");
       new UrlChecker().waitUntilAvailable(20, SECONDS, status);
     } catch (UrlChecker.TimeoutException e) {
-      if (process != null) {
+      if (process != null && !process.isRunning()) {
         process.checkForError();
       }
       throw new WebDriverException("Timed out waiting for driver server to start.", e);