[SYNCOPE-1851] - Resolved NullPointerException related to the DateFie…

…ld in the SyncopeFormPanel class (#949)
apache · Jan 3, 2025 · 9331405 · 9331405
1 parent 4c3a8c7
commit 9331405
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...common-ui/src/main/java/org/apache/syncope/client/ui/commons/panels/SyncopeFormPanel.java b/...common-ui/src/main/java/org/apache/syncope/client/ui/commons/panels/SyncopeFormPanel.java
@@ -92,7 +92,9 @@ public void setObject(final Boolean object) {
                         break;
 
                     case Date:
-                        FastDateFormat formatter = FastDateFormat.getInstance(prop.getDatePattern());
+                        FastDateFormat formatter = StringUtils.isBlank(prop.getDatePattern())
+                                ? FastDateFormat.getInstance()
+                                : FastDateFormat.getInstance(prop.getDatePattern());
                         field = new AjaxDateTimeFieldPanel("value", label, new PropertyModel<>(prop, "value") {
 
                             private static final long serialVersionUID = -3743432456095828573L;
@@ -111,7 +113,7 @@ public Date getObject() {
 
                             @Override
                             public void setObject(final Date object) {
-                                prop.setValue(formatter.format(object));
+                                Optional.ofNullable(object).ifPresent(date -> prop.setValue(formatter.format(date)));
                             }
                         }, formatter);
                         break;