From ea07e83552c150e2d5fbe62e17971e826571af55 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 31 Aug 2023 08:49:06 +0200 Subject: [PATCH] Guard against potential NPE. Original Pull Request: #4463 --- .../springframework/data/mongodb/core/QueryOperations.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/QueryOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/QueryOperations.java index fd1da7f70..eabbc276d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/QueryOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/QueryOperations.java @@ -811,7 +811,7 @@ class QueryOperations { Document mappedQuery = super.getMappedQuery(domainType); - if (multi && update.isIsolated() && !mappedQuery.containsKey("$isolated")) { + if (multi && update != null && update.isIsolated() && !mappedQuery.containsKey("$isolated")) { mappedQuery.put("$isolated", 1); } @@ -907,7 +907,7 @@ class QueryOperations { if (persistentEntity != null && persistentEntity.hasVersionProperty()) { String versionFieldName = persistentEntity.getRequiredVersionProperty().getFieldName(); - if (!update.modifies(versionFieldName)) { + if (update != null && !update.modifies(versionFieldName)) { update.inc(versionFieldName); } }