Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java =================================================================== diff -u -r8daec7e047f7ea8404c6f16218b63a8e855a15b2 -r36f567f41d6be3f1894cbd1648baffff0438e622 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 8daec7e047f7ea8404c6f16218b63a8e855a15b2) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 36f567f41d6be3f1894cbd1648baffff0438e622) @@ -93,8 +93,6 @@ // --------------------------------------------------------------------- private static Logger log = Logger.getLogger(LearnerAction.class); - private static JSONObject progressBarMessages = null; - private static final String[] MONITOR_MESSAGE_KEYS = new String[] { "label.learner.progress.activity.current.tooltip", "label.learner.progress.activity.completed.tooltip", "label.learner.progress.activity.attempted.tooltip", "label.learner.progress.activity.tostart.tooltip", @@ -406,20 +404,18 @@ } private JSONObject getProgressBarMessages() throws JSONException { - if (progressBarMessages == null) { - progressBarMessages = new JSONObject(); - MessageService messageService = LearnerServiceProxy - .getMonitoringMessageService(getServlet().getServletContext()); - for (String key : MONITOR_MESSAGE_KEYS) { - String value = messageService.getMessage(key); - progressBarMessages.put(key, value); - } - messageService = LearnerServiceProxy.getMessageService(getServlet().getServletContext()); - for (String key : LEARNER_MESSAGE_KEYS) { - String value = messageService.getMessage(key); - progressBarMessages.put(key, value); - } + JSONObject progressBarMessages = new JSONObject(); + MessageService messageService = LearnerServiceProxy + .getMonitoringMessageService(getServlet().getServletContext()); + for (String key : MONITOR_MESSAGE_KEYS) { + String value = messageService.getMessage(key); + progressBarMessages.put(key, value); } + messageService = LearnerServiceProxy.getMessageService(getServlet().getServletContext()); + for (String key : LEARNER_MESSAGE_KEYS) { + String value = messageService.getMessage(key); + progressBarMessages.put(key, value); + } return progressBarMessages; }