From 1dc60bfbe5fa27db3435856464268449ff3a8076 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 2 Jan 2024 14:30:30 +0100
Subject: [PATCH] OZG-4375 handle null values when converting date string
---
.../main/java/de/ozgcloud/alfa/common/DateConverter.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/common/DateConverter.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/common/DateConverter.java
index 20e9f11df9..d2058d9142 100644
--- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/common/DateConverter.java
+++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/common/DateConverter.java
@@ -26,11 +26,13 @@ public class DateConverter {
public Optional<XMLGregorianCalendar> convertGermanFormatToISO(String dateStr) {
try {
- return Optional.of(createDatatypeFactory().newXMLGregorianCalendar(LocalDate.parse(dateStr, DATE_TIME_FORMATTER).toString()));
+ if (nonNull(dateStr)) {
+ return Optional.of(createDatatypeFactory().newXMLGregorianCalendar(LocalDate.parse(dateStr, DATE_TIME_FORMATTER).toString()));
+ }
} catch (Exception e) {
LOG.warn("Date '{}' cannot be converted to ISO format.", dateStr, e);
- return Optional.empty();
}
+ return Optional.empty();
}
public XMLGregorianCalendar toXmlGregorianCalendar(ZonedDateTime date) {
--
GitLab