Catch if resolveSimplePlaceholder is passed null

DDS-GmbH · Aug 3, 2023 · 09bb80f · 09bb80f
1 parent c5f1c59
commit 09bb80f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 group 'com.docutools'
-version = '1.6.1'
+version = '1.6.2'
 
 java {
     toolchain {

diff --git a/src/main/java/com/docutools/jocument/impl/ReflectionResolver.java b/src/main/java/com/docutools/jocument/impl/ReflectionResolver.java
@@ -380,7 +380,9 @@ private Optional<PlaceholderData> doReflectiveResolve(String placeholderName, Lo
   }
 
   private Optional<PlaceholderData> resolveSimplePlaceholder(Object property, String placeholderName, Locale locale, GenerationOptions options) {
-    if (property instanceof Number number) {
+    if (property == null) {
+      return Optional.empty();
+    } else if (property instanceof Number number) {
       var numberFormat = findNumberFormat(placeholderName, locale);
       return Optional.of(new ScalarPlaceholderData<>(number, numberFormat::format));
     } else if (property instanceof String propertyString && isFieldAnnotatedWith(bean.getClass(), placeholderName, Translatable.class)) {