From 71b27da052a1ebfb2daa4e60225b02c300c61d27 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 10 Jan 2025 17:16:38 +0100 Subject: [PATCH] Fix su converter da localDate nel caso di data nulla --- .../java/it/integry/ems_model/utility/UtilityLocalDate.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ems-core/src/main/java/it/integry/ems_model/utility/UtilityLocalDate.java b/ems-core/src/main/java/it/integry/ems_model/utility/UtilityLocalDate.java index 5d71d65b42..2e8f564cc7 100644 --- a/ems-core/src/main/java/it/integry/ems_model/utility/UtilityLocalDate.java +++ b/ems-core/src/main/java/it/integry/ems_model/utility/UtilityLocalDate.java @@ -44,6 +44,8 @@ public class UtilityLocalDate { } public static LocalDate localDateFromDate(Date dateToConvert) { + if(dateToConvert == null) return null; + if (dateToConvert instanceof java.sql.Date){ dateToConvert = new Date(dateToConvert.getTime()); } @@ -53,12 +55,16 @@ public class UtilityLocalDate { } public static LocalDateTime localDateTimeFromDate(Date dateToConvert) { + if(dateToConvert == null) return null; + return dateToConvert.toInstant() .atZone(currentZone) .toLocalDateTime(); } public static LocalDateTime localDateTimeFromLocalDate(LocalDate dateToConvert) { + if(dateToConvert == null) return null; + return dateToConvert .atStartOfDay(); }