SeleniumHQ
diff --git a/‎java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java‎
Lines changed: 3 additions & 6 deletions b/‎java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java‎
Lines changed: 3 additions & 6 deletions
@@ -290,13 +290,10 @@ private static final CommandExecutor createCommandExecutor(Capabilities desiredC
     if (isLegacy(desiredCapabilities)) {
       return new LazyCommandExecutor(binary, profile);
     }
-    GeckoDriverService.Builder builder;
-    if (binary == null) {
-      builder = new GeckoDriverService.Builder();
-    } else {
-      builder = new GeckoDriverService.Builder(binary);
+    GeckoDriverService.Builder builder = new GeckoDriverService.Builder().usingPort(0);
+    if (binary != null) {
+      builder.usingFirefoxBinary(binary);
     }
-    builder.usingPort(0);
     return new DriverCommandExecutor(builder.build());
   }
Original file line number	Diff line number	Diff line change
`@@ -290,13 +290,10 @@ private static final CommandExecutor createCommandExecutor(Capabilities desiredC`
`290`	`290`	`if (isLegacy(desiredCapabilities)) {`
`291`	`291`	`return new LazyCommandExecutor(binary, profile);`
`292`	`292`	`}`
`293`		`- GeckoDriverService.Builder builder;`
`294`		`- if (binary == null) {`
`295`		`- builder = new GeckoDriverService.Builder();`
`296`		`- } else {`
`297`		`- builder = new GeckoDriverService.Builder(binary);`
	`293`	`+ GeckoDriverService.Builder builder = new GeckoDriverService.Builder().usingPort(0);`
	`294`	`+ if (binary != null) {`
	`295`	`+ builder.usingFirefoxBinary(binary);`
`298`	`296`	`}`
`299`		`- builder.usingPort(0);`
`300`	`297`	`return new DriverCommandExecutor(builder.build());`
`301`	`298`	`}`
`302`	`299`