GitHub-Spring
/
spring-data-mongodb
mirror of https://github.com/spring-projects/spring-data-mongodb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Guard against potential NPE. 

Original Pull Request: #4463
pull/4498/head
Mark Paluch 2 years ago committed by Christoph Strobl
parent
501a1cce39
commit
ea07e83552
No known key found for this signature in database
GPG Key ID: 8CC1AB53391458C8
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/QueryOperations.java

4
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/QueryOperations.java
Unescape View File

@ -811,7 +811,7 @@ class QueryOperations {
Document mappedQuery = super.getMappedQuery(domainType); 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); mappedQuery.put("$isolated", 1);
} }
@ -907,7 +907,7 @@ class QueryOperations {
if (persistentEntity != null && persistentEntity.hasVersionProperty()) { if (persistentEntity != null && persistentEntity.hasVersionProperty()) {
String versionFieldName = persistentEntity.getRequiredVersionProperty().getFieldName(); String versionFieldName = persistentEntity.getRequiredVersionProperty().getFieldName();
if (!update.modifies(versionFieldName)) { if (update != null && !update.modifies(versionFieldName)) {
update.inc(versionFieldName); update.inc(versionFieldName);
} }
} }

Write Preview
Loading…
Cancel
Save