Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v
diff -u -r1.74 -r1.75
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	8 Apr 2016 13:05:53 -0000	1.74
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	20 Apr 2016 17:08:28 -0000	1.75
@@ -458,9 +458,10 @@
 	GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
 
 	String httpSessionID = qaLearningForm.getHttpSessionID();
-
 	qaLearningForm.setHttpSessionID(httpSessionID);
 	generalLearnerFlowDTO.setHttpSessionID(httpSessionID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(httpSessionID);
 
 	/*recreate the users and responses*/
 	qaLearningForm.resetUserActions();
@@ -477,16 +478,24 @@
 
 	qaLearningForm.resetAll();
 
-	boolean lockWhenFinished = qaContent.isLockWhenFinished();
+	boolean lockWhenFinished;
+	boolean noReeditAllowed;
+	if (sessionMap.get("noRefresh") != null && (Boolean)sessionMap.get("noRefresh")) {
+	    lockWhenFinished = true;
+	    noReeditAllowed = true;
+	} else {
+	    lockWhenFinished = qaContent.isLockWhenFinished();
+	    noReeditAllowed = qaContent.isNoReeditAllowed();
+	}
 	generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString());
-	generalLearnerFlowDTO.setNoReeditAllowed(qaContent.isNoReeditAllowed());
+	generalLearnerFlowDTO.setNoReeditAllowed(noReeditAllowed);
 
 	boolean allowRichEditor = qaContent.isAllowRichEditor();
 	generalLearnerFlowDTO.setAllowRichEditor(new Boolean(allowRichEditor).toString());
 
 	boolean useSelectLeaderToolOuput = qaContent.isUseSelectLeaderToolOuput();
 	generalLearnerFlowDTO.setUseSelectLeaderToolOuput(new Boolean(useSelectLeaderToolOuput).toString());
-	
+
 	generalLearnerFlowDTO.setAllowRateAnswers(new Boolean(qaContent.isAllowRateAnswers()).toString());
 
 	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v
diff -u -r1.94 -r1.95
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	16 Apr 2016 14:00:08 -0000	1.94
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	20 Apr 2016 17:08:28 -0000	1.95
@@ -308,6 +308,8 @@
 		if (qaContent.isShowOtherAnswersAfterDeadline()) {
 		    generalLearnerFlowDTO.setLockWhenFinished(Boolean.TRUE.toString());
 		    generalLearnerFlowDTO.setNoReeditAllowed(true);
+		    //only for ActionForward refreshAllResults(..) method
+		    sessionMap.put("noRefresh", true);
 		    /*
 		     * the report should have all the users' entries OR the report should have only the current
 		     * session's entries