eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 21:55:39 +00:00
Code Activity

avoid NPEs when MarkProperties have null as their tags collection

Browse Source
This commit is contained in:
Axel Uhl
2020-12-08 16:51:14 +01:00
parent 5321a56c89
commit 00c9019239
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.shared.persistence/src/com/sap/sailing/shared/persistence/impl/MongoObjectFactoryImpl.java
+6 -2
View File
@@ -101,7 +101,9 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
});
}
BasicDBList tags = new BasicDBList();
markProperties.getTags().forEach(tags::add);
if (markProperties.getTags() != null) {
markProperties.getTags().forEach(tags::add);
}
result.put(FieldNames.MARK_PROPERTIES_TAGS.name(), tags);
Map<String, Long> lastUsedTemplateMap = markProperties.getLastUsedMarkTemplate().entrySet().stream()
.collect(Collectors.toMap(k -> k.getKey().getId().toString(), v -> v.getValue().asMillis()));
@@ -261,7 +263,9 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
result.put(FieldNames.COURSE_TEMPLATE_WAYPOINTS.name(), waypointTemplates);
// tags
final BasicDBList tags = new BasicDBList();
courseTemplate.getTags().forEach(tags::add);
if (courseTemplate.getTags() != null) {
courseTemplate.getTags().forEach(tags::add);
}
result.put(FieldNames.COURSE_TEMPLATE_TAGS.name(), tags);
// repeatable part
if (courseTemplate.hasRepeatablePart()) {