diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java index 09417cb2..238a8c25 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbColr.java @@ -10,6 +10,7 @@ import java.util.Date; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityLogger; +import it.integry.integrywmsnative.core.utility.UtilityString; public class MtbColr extends EntityBase implements Parcelable { @@ -535,7 +536,9 @@ public class MtbColr extends EntityBase implements Parcelable { public Date getDataScadPartitaD() { SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); try { - return sdf.parse(getDataScadPartitaS()); + if(!UtilityString.isNullOrEmpty(getDataScadPartitaS())) + return sdf.parse(getDataScadPartitaS()); + else return null; } catch (Exception ex) { UtilityLogger.errorMe(ex); return null;