SeleniumHQ
diff --git a/‎java/client/src/org/openqa/selenium/Capabilities.java‎
Lines changed: 3 additions & 1 deletion b/‎java/client/src/org/openqa/selenium/Capabilities.java‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎java/client/src/org/openqa/selenium/remote/DesiredCapabilities.java‎
Lines changed: 3 additions & 3 deletions b/‎java/client/src/org/openqa/selenium/remote/DesiredCapabilities.java‎
Lines changed: 3 additions & 3 deletions
@@ -95,7 +95,9 @@ default boolean is(String capabilityName) {
   default Capabilities merge(Capabilities other) {
     HashMap<String, Object> map = new HashMap<>();
     map.putAll(asMap());
-    map.putAll(other.asMap());
+    if (other != null) {
+      map.putAll(other.asMap());
+    }
     return new ImmutableCapabilities(map);
   }
 }
@@ -139,9 +139,9 @@ public Object getCapability(String capabilityName) {
   public DesiredCapabilities merge(Capabilities extraCapabilities) {
     if (extraCapabilities != null) {
       capabilities.putAll(extraCapabilities.asMap());
-    }
-    if (extraCapabilities.getCapability(UNEXPECTED_ALERT_BEHAVIOUR) != null) {
-      capabilities.put(UNHANDLED_PROMPT_BEHAVIOUR, extraCapabilities.getCapability(UNEXPECTED_ALERT_BEHAVIOUR));
+      if (extraCapabilities.getCapability(UNEXPECTED_ALERT_BEHAVIOUR) != null) {
+        capabilities.put(UNHANDLED_PROMPT_BEHAVIOUR, extraCapabilities.getCapability(UNEXPECTED_ALERT_BEHAVIOUR));
+      }
     }
     return this;
   }
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,9 @@ default boolean is(String capabilityName) {`
`95`	`95`	`default Capabilities merge(Capabilities other) {`
`96`	`96`	`HashMap<String, Object> map = new HashMap<>();`
`97`	`97`	`map.putAll(asMap());`
`98`		`- map.putAll(other.asMap());`
	`98`	`+ if (other != null) {`
	`99`	`+ map.putAll(other.asMap());`
	`100`	`+ }`
`99`	`101`	`return new ImmutableCapabilities(map);`
`100`	`102`	`}`
`101`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,9 +139,9 @@ public Object getCapability(String capabilityName) {`
`139`	`139`	`public DesiredCapabilities merge(Capabilities extraCapabilities) {`
`140`	`140`	`if (extraCapabilities != null) {`
`141`	`141`	`capabilities.putAll(extraCapabilities.asMap());`
`142`		`- }`
`143`		`- if (extraCapabilities.getCapability(UNEXPECTED_ALERT_BEHAVIOUR) != null) {`
`144`		`- capabilities.put(UNHANDLED_PROMPT_BEHAVIOUR, extraCapabilities.getCapability(UNEXPECTED_ALERT_BEHAVIOUR));`
	`142`	`+ if (extraCapabilities.getCapability(UNEXPECTED_ALERT_BEHAVIOUR) != null) {`
	`143`	`+ capabilities.put(UNHANDLED_PROMPT_BEHAVIOUR, extraCapabilities.getCapability(UNEXPECTED_ALERT_BEHAVIOUR));`
	`144`	`+ }`
`145`	`145`	`}`
`146`	`146`	`return this;`
`147`	`147`	`}`