[java] Add check back to driver service session factory

SeleniumHQ · Jan 8, 2024 · e1e538e · e1e538e
1 parent a040c34
commit e1e538e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/java/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java b/java/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java
@@ -131,10 +131,12 @@ public Either<WebDriverException, ActiveSession> apply(CreateSessionRequest sess
       attributeMap.put(AttributeKey.LOGGER_CLASS.getKey(), this.getClass().getName());
 
       DriverService service = builder.build();
-      Result driverResult = DriverFinder.getPath(service, capabilities);
-      service.setExecutable(driverResult.getDriverPath());
-      if (driverResult.getBrowserPath() != null && !driverResult.getBrowserPath().isEmpty()) {
-        capabilities = setBrowserBinary(capabilities, driverResult.getBrowserPath());
+      if (service.getExecutable() == null) {
+        Result driverResult = DriverFinder.getPath(service, capabilities);
+        service.setExecutable(driverResult.getDriverPath());
+        if (driverResult.getBrowserPath() != null && !driverResult.getBrowserPath().isEmpty()) {
+          capabilities = setBrowserBinary(capabilities, driverResult.getBrowserPath());
+        }
       }
 
       Optional<Platform> platformName = Optional.ofNullable(capabilities.getPlatformName());