From 78fc2e04568b6076f11b76e646bad99db24827c7 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Mon, 18 Mar 2019 13:44:13 +0100 Subject: [PATCH] DATAMONGO-2225 - Fix potential NPE in MongoExampleMapper. --- .../data/mongodb/core/convert/MongoExampleMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 05ccce787..a0601dc02 100644 --- 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 @@ public class MongoExampleMapper { } private static boolean isEmptyIdProperty(Entry 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 entry, StringMatcher stringMatcher,