[java] do not set browser binary if it is an empty string (#12738)

SeleniumHQ · Oct 16, 2023 · 8ed8aa2 · 8ed8aa2
1 parent 9ff1fe2
commit 8ed8aa2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/java/src/org/openqa/selenium/chrome/ChromeDriver.java b/java/src/org/openqa/selenium/chrome/ChromeDriver.java
@@ -99,7 +99,7 @@ private static ChromeDriverCommandExecutor generateExecutor(
     if (service.getExecutable() == null) {
       Result result = DriverFinder.getPath(service, options);
       service.setExecutable(result.getDriverPath());
-      if (result.getBrowserPath() != null) {
+      if (result.getBrowserPath() != null && !result.getBrowserPath().isEmpty()) {
         options.setBinary(result.getBrowserPath());
       }
     }

diff --git a/java/src/org/openqa/selenium/edge/EdgeDriver.java b/java/src/org/openqa/selenium/edge/EdgeDriver.java
@@ -71,7 +71,7 @@ private static EdgeDriverCommandExecutor generateExecutor(
     if (service.getExecutable() == null) {
       Result result = DriverFinder.getPath(service, options);
       service.setExecutable(result.getDriverPath());
-      if (result.getBrowserPath() != null) {
+      if (result.getBrowserPath() != null && !result.getBrowserPath().isEmpty()) {
         options.setBinary(result.getBrowserPath());
       }
     }

diff --git a/java/src/org/openqa/selenium/firefox/FirefoxDriver.java b/java/src/org/openqa/selenium/firefox/FirefoxDriver.java
@@ -141,7 +141,7 @@ private static FirefoxDriverCommandExecutor generateExecutor(
     if (service.getExecutable() == null) {
       Result result = DriverFinder.getPath(service, options);
       service.setExecutable(result.getDriverPath());
-      if (result.getBrowserPath() != null) {
+      if (result.getBrowserPath() != null && !result.getBrowserPath().isEmpty()) {
         options.setBinary(result.getBrowserPath());
       }
     }

diff --git a/java/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java b/java/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java
@@ -134,7 +134,7 @@ public Either<WebDriverException, ActiveSession> apply(CreateSessionRequest sess
       if (service.getExecutable() == null) {
         Result result = DriverFinder.getPath(service, capabilities);
         service.setExecutable(result.getDriverPath());
-        if (result.getBrowserPath() != null) {
+        if (result.getBrowserPath() != null && !result.getBrowserPath().isEmpty()) {
           capabilities = setBrowserBinary(capabilities, result.getBrowserPath());
         }
       }