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.2 -r1.149.2.3 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 7 May 2009 06:01:23 -0000 1.149.2.2 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 8 May 2009 01:49:20 -0000 1.149.2.3 @@ -1434,16 +1434,15 @@ Locale userLocale = new Locale(user.getLocale().getLanguageIsoCode(), user.getLocale().getCountryIsoCode()); TimeZone tz = TimeZone.getTimeZone(User.timezoneList[user.getTimeZone()]); - Date tzStartDate = DateUtil.convertFromUTCToLocal(tz, DateUtil.convertToUTC(dto.getStartDateTime())); - Date tzScheduleDate = DateUtil.convertFromUTCToLocal(tz, DateUtil.convertToUTC(dto.getScheduleStartDate())); - if (dto.getStartDateTime() != null) { - dto.setStartDateTimeStr(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, userLocale) + Date tzStartDate = DateUtil.convertFromUTCToLocal(tz, DateUtil.convertToUTC(dto.getStartDateTime())); + dto.setStartDateTimeStr(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, userLocale) .format(tzStartDate)); } if (dto.getScheduleStartDate() != null) { - dto.setScheduleStartDateStr(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, userLocale) + Date tzScheduleDate = DateUtil.convertFromUTCToLocal(tz, DateUtil.convertToUTC(dto.getScheduleStartDate())); + dto.setScheduleStartDateStr(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, userLocale) .format(tzScheduleDate)); }