From b2bbfad26eaada36f234b926ecefbf2e75c94d33 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 2 May 2017 11:16:59 +0200 Subject: [PATCH] [Fix] Fixed NPE in DateRange.toString() --- .../java/li/strolch/utils/collections/DateRange.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/DateRange.java b/li.strolch.utils/src/main/java/li/strolch/utils/collections/DateRange.java index 1aa3a170b..73977f365 100644 --- a/li.strolch.utils/src/main/java/li/strolch/utils/collections/DateRange.java +++ b/li.strolch.utils/src/main/java/li/strolch/utils/collections/DateRange.java @@ -127,7 +127,12 @@ public class DateRange { @Override public String toString() { ISO8601FormatFactory df = ISO8601FormatFactory.getInstance(); - return df.formatDate(this.fromDate) + (this.fromInclusive ? " (inc)" : " (exc)") + " - " - + df.formatDate(this.toDate) + (this.toInclusive ? " (inc)" : " (exc)"); + StringBuilder sb = new StringBuilder(); + sb.append(this.fromDate == null ? "-" : df.formatDate(this.fromDate)); + sb.append((this.fromInclusive ? " (inc)" : " (exc)")); + sb.append(" - "); + sb.append(this.toDate == null ? "-" : df.formatDate(this.toDate)); + sb.append((this.toInclusive ? " (inc)" : " (exc)")); + return sb.toString(); } }