Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v diff -u -r1.149.2.5 -r1.149.2.6 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 11 May 2009 07:22:02 -0000 1.149.2.5 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 11 May 2009 07:59:45 -0000 1.149.2.6 @@ -1450,12 +1450,12 @@ DateFormat indfm = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss", userLocale); - if (dto.getStartDateTime() != WDDXTAGS.DATE_NULL_VALUE) { + if (dto.getStartDateTime() != WDDXTAGS.DATE_NULL_VALUE && dto.getStartDateTime() != null) { Date tzStartDate = DateUtil.convertToTimeZoneFromDefault(tz, dto.getStartDateTime()); dto.setStartDateTimeStr(indfm.format(tzStartDate) + " " + tz.getDisplayName(userLocale)); } - if (dto.getScheduleStartDate() != WDDXTAGS.DATE_NULL_VALUE) { + if (dto.getScheduleStartDate() != WDDXTAGS.DATE_NULL_VALUE && dto.getScheduleStartDate() != null) { Date tzScheduleDate = DateUtil.convertToTimeZoneFromDefault(tz, dto.getScheduleStartDate()); dto.setScheduleStartDateStr(indfm.format(tzScheduleDate) + " " + tz.getDisplayName(userLocale)); }