Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java =================================================================== diff -u -r3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db -r72d0843d3304959c18b3386b7e938835f795982b --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java (.../LearningController.java) (revision 3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java (.../LearningController.java) (revision 72d0843d3304959c18b3386b7e938835f795982b) @@ -233,14 +233,15 @@ } @RequestMapping(value = "/nextQuestion") - private String nextQuestion(@ModelAttribute("surveyForm") AnswerForm surveyForm, - MultiValueMap errorMap, HttpServletRequest request) { + private String nextQuestion(@ModelAttribute("surveyForm") AnswerForm surveyForm, HttpServletRequest request) { Integer questionSeqID = surveyForm.getQuestionSeqID(); String sessionMapID = surveyForm.getSessionMapID(); SessionMap sessionMap = (SessionMap) request.getSession() .getAttribute(sessionMapID); SortedMap surveyItemMap = getQuestionList(sessionMap); + MultiValueMap errorMap = new LinkedMultiValueMap<>(); + getAnswer(request, surveyItemMap.get(questionSeqID), errorMap); if (!errorMap.isEmpty()) { request.setAttribute("errorMap", errorMap); @@ -276,15 +277,17 @@ } @RequestMapping(value = "/previousQuestion") - private String previousQuestion(@ModelAttribute("surveyForm") AnswerForm surveyForm, - MultiValueMap errorMap, HttpServletRequest request) { + private String previousQuestion(@ModelAttribute("surveyForm") AnswerForm surveyForm, HttpServletRequest request) { Integer questionSeqID = surveyForm.getQuestionSeqID(); String sessionMapID = surveyForm.getSessionMapID(); SessionMap sessionMap = (SessionMap) request.getSession() .getAttribute(sessionMapID); SortedMap surveyItemMap = getQuestionList(sessionMap); + MultiValueMap errorMap = new LinkedMultiValueMap<>(); + getAnswer(request, surveyItemMap.get(questionSeqID), errorMap); + if (!errorMap.isEmpty()) { request.setAttribute("errorMap", errorMap); return "pages/learning/learning";