SAK-32456 Don't blow up if start/end dates aren't set (sakaiproject#4266

)
talk2viren · Apr 17, 2017 · 4349f77 · 4349f77
1 parent 16c2f9e
commit 4349f77
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/syllabus/syllabus-app/src/java/org/sakaiproject/tool/syllabus/SyllabusTool.java b/syllabus/syllabus-app/src/java/org/sakaiproject/tool/syllabus/SyllabusTool.java
@@ -130,8 +130,8 @@ public DecoratedSyllabusEntry(SyllabusData en)
       this.orig_endDate = en.getEndDate() == null ? null : (Date) en.getEndDate().clone();
       this.orig_isLinkCalendar= en.isLinkCalendar();
       this.orig_status = en.getStatus();
-      this.startDateString = DateUtil.format(en.getStartDate(), DATEPICKER_DATETIME_FORMAT, rb.getLocale());
-      this.endDateString = DateUtil.format(en.getEndDate(), DATEPICKER_DATETIME_FORMAT, rb.getLocale());
+      this.startDateString = en.getStartDate() == null ? "" : DateUtil.format(en.getStartDate(), DATEPICKER_DATETIME_FORMAT, rb.getLocale());
+      this.endDateString = en.getEndDate() == null ? "" : DateUtil.format(en.getEndDate(), DATEPICKER_DATETIME_FORMAT, rb.getLocale());
     }
 
     public SyllabusData getEntry()