Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.41 -r1.42
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	23 Aug 2006 06:54:01 -0000	1.41
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	24 Aug 2006 00:05:20 -0000	1.42
@@ -166,10 +166,11 @@
 			return mapping.findForward("error");
 		}
 		
+		Forum forum = session.getForum();
+		//lock on finish
 		ForumUser forumUser = getCurrentUser(request,sessionId);
-		boolean lock = forumUser.isSessionFinished();
+		boolean lock =  forum.getLockWhenFinished() && forumUser.isSessionFinished();
 		
-		Forum forum = session.getForum();
 		//add define later support
 		if(forum.isDefineLater()){
 			return mapping.findForward("defineLater");