Update hamcrest/src/main/java/org/hamcrest/collection/IsMapContaining.java

brownian-motion · nibsi · web-flow · commit 15c523c44300 · 2020-04-13T07:55:27.000-05:00
Co-Authored-By: Stephan van Hulst &lt;2323961+nibsi@users.noreply.github.com&gt;
diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsMapContaining.java b/hamcrest/src/main/java/org/hamcrest/collection/IsMapContaining.java
@@ -94,7 +94,11 @@ public IsMapContainingEntry(K key, V value)
         @Override
         public boolean matchesSafely(Map<? extends K, ? extends V> map)
         {
-            return map.containsKey(key) && super.valueMatcher.matches(map.get(key));
+            try {
+              return map.containsKey(key) && super.valueMatcher.matches(map.get(key));
+            catch (NullPointerException ex) {
+              return false;
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,11 @@ public IsMapContainingEntry(K key, V value)`
`94`	`94`	`@Override`
`95`	`95`	`public boolean matchesSafely(Map<? extends K, ? extends V> map)`
`96`	`96`	`{`
`97`		`- return map.containsKey(key) && super.valueMatcher.matches(map.get(key));`
	`97`	`+ try {`
	`98`	`+ return map.containsKey(key) && super.valueMatcher.matches(map.get(key));`
	`99`	`+ catch (NullPointerException ex) {`
	`100`	`+ return false;`
	`101`	`+ }`
`98`	`102`	`}`
`99`	`103`	`}`
`100`	`104`