DATAMONGO-2225 - Fix potential NPE in MongoExampleMapper.

christophstrobl · christophstrobl · commit 78fc2e04568b · 2019-03-18T13:44:13.000+01:00
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoExampleMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoExampleMapper.java
@@ -277,7 +277,7 @@ private Set<Class<?>> getTypesToMatch(Example<?> example) {
 	}
 
 	private static boolean isEmptyIdProperty(Entry<String, Object> entry) {
-		return entry.getKey().equals("_id") && entry.getValue() == null || entry.getValue().equals(Optional.empty());
+		return entry.getKey().equals("_id") && (entry.getValue() == null || entry.getValue().equals(Optional.empty()));
 	}
 
 	private static void applyStringMatcher(Map.Entry<String, Object> entry, StringMatcher stringMatcher,

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ private Set<Class<?>> getTypesToMatch(Example<?> example) {`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`private static boolean isEmptyIdProperty(Entry<String, Object> entry) {`
`280`		`- return entry.getKey().equals("_id") && entry.getValue() == null \|\| entry.getValue().equals(Optional.empty());`
	`280`	`+ return entry.getKey().equals("_id") && (entry.getValue() == null \|\| entry.getValue().equals(Optional.empty()));`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`private static void applyStringMatcher(Map.Entry<String, Object> entry, StringMatcher stringMatcher,`