Index: lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java =================================================================== diff -u -rbfa7dfb5557d54767b137652b34dd89c13fb1227 -rfd8bc6f23499e84ca934cc4fcbe67224646e51a4 --- lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java (.../DateUtil.java) (revision bfa7dfb5557d54767b137652b34dd89c13fb1227) +++ lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java (.../DateUtil.java) (revision fd8bc6f23499e84ca934cc4fcbe67224646e51a4) @@ -227,11 +227,6 @@ * @return */ public static String convertToStringForJSON(Date value, Integer style, Integer type, Locale locale) { - - HttpSession ss = SessionManager.getSession(); - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - TimeZone tz = user.getTimeZone(); - int dateStyle, timeStyle; switch (style) { case DateFormat.SHORT: @@ -259,6 +254,9 @@ df = DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale); } + HttpSession ss = SessionManager.getSession(); + UserDTO user = ss == null ? null : (UserDTO) ss.getAttribute(AttributeNames.USER); + TimeZone tz = user == null ? null : user.getTimeZone(); if (tz != null) { df.setTimeZone(tz); }