Skip to content

Commit 9f650fd

Browse files
committed
[grid] Using MutableCapabilities to get rid of browserVersion
And later returning them as PersistentCapabilities Also, restoring the null check in PersistentCapabilities.java Fixes #13937
1 parent 3b42a89 commit 9f650fd

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

java/src/org/openqa/selenium/PersistentCapabilities.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ private PersistentCapabilities(Capabilities previousValues, Capabilities newValu
5050

5151
public PersistentCapabilities setCapability(String name, Object value) {
5252
Require.nonNull("Name", name);
53+
Require.nonNull("Value", value);
5354

5455
return new PersistentCapabilities(this, new ImmutableCapabilities(name, value));
5556
}

java/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,10 @@ private Capabilities setBrowserBinary(Capabilities options, String browserPath)
326326
Map<String, Object> vendorOptions =
327327
(Map<String, Object>) options.getCapability(vendorOptionsCapability);
328328
vendorOptions.put("binary", browserPath);
329-
return new PersistentCapabilities(options)
330-
.setCapability(vendorOptionsCapability, vendorOptions)
331-
.setCapability("browserVersion", null);
329+
MutableCapabilities toReturn = new MutableCapabilities(options);
330+
toReturn.setCapability(vendorOptionsCapability, vendorOptions);
331+
toReturn.setCapability("browserVersion", (String) null);
332+
return new PersistentCapabilities(toReturn);
332333
} catch (Exception e) {
333334
LOG.log(
334335
Level.WARNING,

0 commit comments

Comments
 (0)