Fix NPE regression in 4.8.0

Kouzukii · Kouzukii · commit e4df55fe8922 · 2023-02-23T12:02:50.000+01:00
diff --git a/java/src/org/openqa/selenium/grid/node/config/SessionCapabilitiesMutator.java b/java/src/org/openqa/selenium/grid/node/config/SessionCapabilitiesMutator.java
@@ -57,6 +57,9 @@ public Capabilities apply(Capabilities capabilities) {
     }
 
     String browserName = capabilities.getBrowserName().toLowerCase();
+    if (!BROWSER_OPTIONS.containsKey(browserName)) {
+      return capabilities;
+    }
     String options = BROWSER_OPTIONS.get(browserName);
     if (slotStereotype.asMap().containsKey(options) && capabilities.asMap().containsKey(options)) {
 
diff --git a/java/test/org/openqa/selenium/grid/node/config/SessionCapabilitiesMutatorTest.java b/java/test/org/openqa/selenium/grid/node/config/SessionCapabilitiesMutatorTest.java
@@ -289,4 +289,19 @@ void shouldMergeTopLevelStereotypeAndCaps() {
     assertThat(modifiedCapabilities.get("unhandledPromptBehavior")).isEqualTo("accept");
     assertThat(modifiedCapabilities.get("pageLoadStrategy")).isEqualTo("normal");
   }
+
+  @Test
+  void shouldAllowUnknownBrowserNames() {
+    stereotype = new ImmutableCapabilities(
+            "browserName", "safari");
+
+    sessionCapabilitiesMutator = new SessionCapabilitiesMutator(stereotype);
+
+    capabilities = new ImmutableCapabilities(
+            "browserName", "safari");
+
+    Map<String, Object> modifiedCapabilities = sessionCapabilitiesMutator.apply(capabilities).asMap();
+
+    assertThat(modifiedCapabilities.get("browserName")).isEqualTo("safari");
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,9 @@ public Capabilities apply(Capabilities capabilities) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`String browserName = capabilities.getBrowserName().toLowerCase();`
	`60`	`+ if (!BROWSER_OPTIONS.containsKey(browserName)) {`
	`61`	`+ return capabilities;`
	`62`	`+ }`
`60`	`63`	`String options = BROWSER_OPTIONS.get(browserName);`
`61`	`64`	`if (slotStereotype.asMap().containsKey(options) && capabilities.asMap().containsKey(options)) {`
`62`	`65`