From 12d92aa8019b1727fc8a2dd4a1ad6c2b77e5e874 Mon Sep 17 00:00:00 2001
From: Marc Fisher <fisherii@google.com>
Date: Tue, 20 Sep 2016 19:36:07 -0700
Subject: [PATCH] GeckoDriverService always launches GeckoDriver. (#2808)

GeckoDriver can find Firefox using its own logic (either on the PATH or specified in a capability).
---
 .../openqa/selenium/firefox/GeckoDriverService.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/java/client/src/org/openqa/selenium/firefox/GeckoDriverService.java b/java/client/src/org/openqa/selenium/firefox/GeckoDriverService.java
index 59c7424ab20de..ba33cc47d64a8 100644
--- a/java/client/src/org/openqa/selenium/firefox/GeckoDriverService.java
+++ b/java/client/src/org/openqa/selenium/firefox/GeckoDriverService.java
@@ -101,8 +101,14 @@ protected ImmutableList<String> createArgs() {
       if (getLogFile() != null) {
         argsBuilder.add(String.format("--log-file=\"%s\"", getLogFile().getAbsolutePath()));
       }
-      argsBuilder.add("-b");
-      argsBuilder.add(new Executable(null).getPath());
+      try {
+        Executable firefoxExe = new Executable(null);
+        argsBuilder.add("-b");
+        argsBuilder.add(firefoxExe.getPath());
+      } catch (WebDriverException e) {
+        // Unable to find Firefox. GeckoDriver will be responsible for finding 
+        // Firefox on the PATH or via a capability.
+      }
       return argsBuilder.build();
     }