[Java] Using driver path always for Safari and Safari Technology Preview

diemol · diemol · commit 74e0af80bdf8 · 2023-05-04T10:27:43.000+02:00
Fixes #11952
diff --git a/java/src/org/openqa/selenium/remote/service/DriverFinder.java b/java/src/org/openqa/selenium/remote/service/DriverFinder.java
@@ -17,7 +17,8 @@ public static String getPath(DriverService service, Capabilities options) {
     String defaultPath = new ExecutableFinder().find(service.getDriverName());
     String exePath = System.getProperty(service.getDriverProperty(), defaultPath);
 
-    if (exePath == null && service.getDriverExecutable() != null) {
+    if (service.getDriverExecutable() != null) {
+      // This is the case for Safari and Safari Technology Preview
       exePath = service.getDriverExecutable().getAbsolutePath();
     }
 
@@ -35,10 +36,9 @@ public static String getPath(DriverService service, Capabilities options) {
         "see https://www.selenium.dev/documentation/webdriver/getting_started/install_drivers/",
         service.getDriverName());
 
-      File exe = new File(validPath);
-      Require.state("The driver executable", exe).isFile();
-      Require.stateCondition(exe.canExecute(), "It must be an executable file: %s", exe);
-      return validPath;
-    }
-
+    File exe = new File(validPath);
+    Require.state("The driver executable", exe).isFile();
+    Require.stateCondition(exe.canExecute(), "It must be an executable file: %s", exe);
+    return validPath;
+  }
 }
