Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java =================================================================== diff -u -ra7467b00292762ea5a77e643721b18fb70224451 -rb296c7b26b2bfa11fe103c4da6fb29bed4d71731 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision a7467b00292762ea5a77e643721b18fb70224451) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision b296c7b26b2bfa11fe103c4da6fb29bed4d71731) @@ -314,7 +314,11 @@ sessionMap.put(AssessmentConstants.ATTR_REFLECTION_INSTRUCTION, assessment.getReflectInstructions()); sessionMap.put(AssessmentConstants.ATTR_REFLECTION_ENTRY, entryText); - sessionMap.put(AttributeNames.ATTR_IS_LAST_ACTIVITY, service.isLastActivity(toolSessionId)); + Boolean isLastActivity = (Boolean) sessionMap.get(AttributeNames.ATTR_IS_LAST_ACTIVITY); + if (isLastActivity == null) { + isLastActivity = service.isLastActivity(toolSessionId); + sessionMap.put(AttributeNames.ATTR_IS_LAST_ACTIVITY, isLastActivity); + } // add define later support if (assessment.isDefineLater()) {