Merge 2b4a66d into e69feee

shs96c · web-flow · commit 1deb51f264f2 · 2023-07-31T13:06:19.000Z
diff --git a/java/src/org/openqa/selenium/firefox/FirefoxDriver.java b/java/src/org/openqa/selenium/firefox/FirefoxDriver.java
@@ -140,7 +140,9 @@ private static FirefoxDriverCommandExecutor generateExecutor(
     if (service.getExecutable() == null) {
       Result result = DriverFinder.getPath(service, options);
       service.setExecutable(result.getDriverPath());
-      options.setBinary(result.getBrowserPath());
+      if (result.getBrowserPath() != null && !options.getBinaryOrNull().isPresent()) {
+        options.setBinary(result.getBrowserPath());
+      }
     }
     return new FirefoxDriverCommandExecutor(service, clientConfig);
   }

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,9 @@ private static FirefoxDriverCommandExecutor generateExecutor(`
`140`	`140`	`if (service.getExecutable() == null) {`
`141`	`141`	`Result result = DriverFinder.getPath(service, options);`
`142`	`142`	`service.setExecutable(result.getDriverPath());`
`143`		`- options.setBinary(result.getBrowserPath());`
	`143`	`+ if (result.getBrowserPath() != null && !options.getBinaryOrNull().isPresent()) {`
	`144`	`+ options.setBinary(result.getBrowserPath());`
	`145`	`+ }`
`144`	`146`	`}`
`145`	`147`	`return new FirefoxDriverCommandExecutor(service, clientConfig);`
`146`	`148`	`}`