[java] Making sure browser path is not null

diemol · diemol · commit aa68cb13ac87 · 2023-07-31T15:27:28.000+02:00
Closes #12450
diff --git a/java/src/org/openqa/selenium/chrome/ChromeDriver.java b/java/src/org/openqa/selenium/chrome/ChromeDriver.java
@@ -98,7 +98,9 @@ private static ChromeDriverCommandExecutor generateExecutor(
     if (service.getExecutable() == null) {
       Result result = DriverFinder.getPath(service, options);
       service.setExecutable(result.getDriverPath());
-      options.setBinary(result.getBrowserPath());
+      if (result.getBrowserPath() != null) {
+        options.setBinary(result.getBrowserPath());
+      }
     }
     return new ChromeDriverCommandExecutor(service, clientConfig);
   }
diff --git a/java/src/org/openqa/selenium/edge/EdgeDriver.java b/java/src/org/openqa/selenium/edge/EdgeDriver.java
@@ -70,7 +70,9 @@ private static EdgeDriverCommandExecutor generateExecutor(
     if (service.getExecutable() == null) {
       Result result = DriverFinder.getPath(service, options);
       service.setExecutable(result.getDriverPath());
-      options.setBinary(result.getBrowserPath());
+      if (result.getBrowserPath() != null) {
+        options.setBinary(result.getBrowserPath());
+      }
     }
     return new EdgeDriverCommandExecutor(service, clientConfig);
   }
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.setBinary(result.getBrowserPath());
+      }
     }
     return new FirefoxDriverCommandExecutor(service, clientConfig);
   }

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,9 @@ private static ChromeDriverCommandExecutor generateExecutor(`
`98`	`98`	`if (service.getExecutable() == null) {`
`99`	`99`	`Result result = DriverFinder.getPath(service, options);`
`100`	`100`	`service.setExecutable(result.getDriverPath());`
`101`		`- options.setBinary(result.getBrowserPath());`
	`101`	`+ if (result.getBrowserPath() != null) {`
	`102`	`+ options.setBinary(result.getBrowserPath());`
	`103`	`+ }`
`102`	`104`	`}`
`103`	`105`	`return new ChromeDriverCommandExecutor(service, clientConfig);`
`104`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,9 @@ private static EdgeDriverCommandExecutor generateExecutor(`
`70`	`70`	`if (service.getExecutable() == null) {`
`71`	`71`	`Result result = DriverFinder.getPath(service, options);`
`72`	`72`	`service.setExecutable(result.getDriverPath());`
`73`		`- options.setBinary(result.getBrowserPath());`
	`73`	`+ if (result.getBrowserPath() != null) {`
	`74`	`+ options.setBinary(result.getBrowserPath());`
	`75`	`+ }`
`74`	`76`	`}`
`75`	`77`	`return new EdgeDriverCommandExecutor(service, clientConfig);`
`76`	`78`	`}`
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) {`
	`144`	`+ options.setBinary(result.getBrowserPath());`
	`145`	`+ }`
`144`	`146`	`}`
`145`	`147`	`return new FirefoxDriverCommandExecutor(service, clientConfig);`
`146`	`148`	`}`