Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml
===================================================================
diff -u -r2a57d40ab3cf7e13403891bc612cd599217da234 -rf6f0e93d2134d055aadd9414aee1b588f0669c19
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
@@ -70,6 +70,14 @@
             column="login_name"
         />
 
+        <property
+            name="sessionFinished"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="session_finished"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ForumUser.xml
Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
diff -u -r67333d9d0d4a93667e5b86544a3fca0cf85eacb8 -rf6f0e93d2134d055aadd9414aee1b588f0669c19
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 67333d9d0d4a93667e5b86544a3fca0cf85eacb8)
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
@@ -51,6 +51,7 @@
    first_name varchar(255),
    session_id bigint,
    login_name varchar(255),
+   session_finished smallint,
    primary key (uid)
 );
 create table tl_lafrum11_message (
Index: lams_tool_forum/db/sql/table-schema.sql
===================================================================
diff -u -r67333d9d0d4a93667e5b86544a3fca0cf85eacb8 -rf6f0e93d2134d055aadd9414aee1b588f0669c19
--- lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision 67333d9d0d4a93667e5b86544a3fca0cf85eacb8)
+++ lams_tool_forum/db/sql/table-schema.sql	(.../table-schema.sql)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
@@ -20,7 +20,7 @@
 drop table if exists tl_lafrum11_tool_session;
 create table tl_lafrum11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, forum_uid bigint, message_uid bigint, primary key (uid));
 create table tl_lafrum11_forum (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), allow_anonym bit, run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_edit bit, allow_rich_editor bit, limited_of_chars integer, limited_input_flag bit, allow_new_topic bit, allow_upload bit, maximum_reply integer, minimum_reply integer, primary key (uid));
-create table tl_lafrum11_forum_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), session_id bigint, login_name varchar(255), primary key (uid));
+create table tl_lafrum11_forum_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), session_id bigint, login_name varchar(255), session_finished bit, primary key (uid));
 create table tl_lafrum11_message (uid bigint not null auto_increment, create_date datetime, last_reply_date datetime, update_date datetime, create_by bigint, modified_by bigint, subject varchar(255), body text, is_authored bit, is_anonymous bit, forum_session_uid bigint, parent_uid bigint, forum_uid bigint, reply_number integer, hide_flag bit, report_id bigint, primary key (uid));
 create table tl_lafrum11_message_seq (uid bigint not null auto_increment, root_message_uid bigint, message_uid bigint, message_level smallint, primary key (uid));
 create table tl_lafrum11_report (uid bigint not null auto_increment, comment text, release_date datetime, mark float, primary key (uid));
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
diff -u -rbd383652fb10a2e82b00cbcc2ed08ac02183b1d3 -rf6f0e93d2134d055aadd9414aee1b588f0669c19
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision bd383652fb10a2e82b00cbcc2ed08ac02183b1d3)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
@@ -128,6 +128,7 @@
                 <prop key="deleteFromRepository">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="updateSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="releaseMarksForSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="finishUserSession">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <!--  Tool Content Manager and Tool Session Manager calls -->
                 <prop key="copyToolContent">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="removeToolContent">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml
===================================================================
diff -u -r2a57d40ab3cf7e13403891bc612cd599217da234 -rf6f0e93d2134d055aadd9414aee1b588f0669c19
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision 2a57d40ab3cf7e13403891bc612cd599217da234)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml	(.../ForumUser.hbm.xml)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
@@ -70,6 +70,14 @@
             column="login_name"
         />
 
+        <property
+            name="sessionFinished"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="session_finished"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ForumUser.xml
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java
===================================================================
diff -u -rd9c7ddef141d19423b6ab2914d153c2cb748f187 -rf6f0e93d2134d055aadd9414aee1b588f0669c19
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java	(.../ForumUser.java)	(revision d9c7ddef141d19423b6ab2914d153c2cb748f187)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java	(.../ForumUser.java)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
@@ -49,6 +49,8 @@
 	private String firstName;
 	private String lastName;
 	private String loginName;
+	private boolean sessionFinished;
+	
 	private ForumToolSession session;
 	
 	public ForumUser(){
@@ -60,6 +62,7 @@
 		this.lastName = user.getLastName();
 		this.loginName = user.getLogin();
 		this.session = session;
+		this.sessionFinished = false;
 	}
 	
 
@@ -158,7 +161,18 @@
 	public void setLoginName(String loginName) {
 		this.loginName = loginName;
 	}
+	/**
+	 * @hibernate.property column="session_finished"
+	 * @return
+	 */
+	public boolean isSessionFinished() {
+		return sessionFinished;
+	}
 
+	public void setSessionFinished(boolean sessionFinished) {
+		this.sessionFinished = sessionFinished;
+	}
+	
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
@@ -178,4 +192,5 @@
 		.toHashCode();
 	}
 
+
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r16913ae571fceab1287d08d9ffc8c995a236620a -rf6f0e93d2134d055aadd9414aee1b588f0669c19
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 16913ae571fceab1287d08d9ffc8c995a236620a)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
@@ -450,6 +450,11 @@
 		
 	}
 
+	public void finishUserSession(ForumUser currentUser) {
+		currentUser.setSessionFinished(true);
+		forumUserDao.save(currentUser);
+	}
+
     //***************************************************************************************************************
     // Private methods
     //***************************************************************************************************************
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -r27d386f3472e12afab03d53dfde3ed9b1c9a44d3 -rf6f0e93d2134d055aadd9414aee1b588f0669c19
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 27d386f3472e12afab03d53dfde3ed9b1c9a44d3)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
@@ -284,5 +284,9 @@
 	
 	/** The topic updates (for monitoring) are done in the web layer, so need the audit service to log the updates */
 	public IAuditService getAuditService( );
-
+	/**
+	 * Mark user completing a session.  
+	 * @param currentUser
+	 */
+	public void finishUserSession(ForumUser currentUser);
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -r5e9e3b9c895e932ff86edb7a64cf4b81f59f766c -rf6f0e93d2134d055aadd9414aee1b588f0669c19
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 5e9e3b9c895e932ff86edb7a64cf4b81f59f766c)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
@@ -31,6 +31,7 @@
  */
 public interface ForumConstants {
 	public static final int COMPLETED = 1;
+	public static final int SESSION_STATUS_FINISHED = 1;
 	
 	public static final String TOOL_SIGNATURE = "lafrum11";
 	
@@ -50,7 +51,6 @@
 	public static final String TOOL_URL_BASE = "/lams/tool/lafrum11/";
 	public static final String FORUM_ID = "forum_id";
 
-	public static final int SESSION_STATUS_FINISHED = 1;
 	public static final String ATTR_ALLOW_EDIT = "allowEdit";
 	public static final String ATTR_ALLOW_UPLOAD = "allowUpload";
 	public static final String ATTR_ALLOW_NEW_TOPICS = "allowNewTopics";
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -r07bc909cfe122031c6236b32088858d4cd295fe9 -rf6f0e93d2134d055aadd9414aee1b588f0669c19
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 07bc909cfe122031c6236b32088858d4cd295fe9)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
@@ -166,8 +166,8 @@
 			return mapping.findForward("error");
 		}
 		
-		boolean lock = session.getForum().getLockWhenFinished();
-		lock = lock && (session.getStatus() == ForumConstants.SESSION_STATUS_FINISHED ? true : false);
+		ForumUser forumUser = getCurrentUser(request,sessionId);
+		boolean lock = forumUser.isSessionFinished();
 		
 		Forum forum = session.getForum();
 		//add define later support
@@ -222,9 +222,11 @@
 			HttpServletRequest request, HttpServletResponse response) {
 		Long sessionId = WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID);
 		ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, MODE_OPTIONAL);
+		String sessionMapID = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID);
 		
+		forumService = getForumManager();
+		
 		if (mode == ToolAccessMode.LEARNER || mode==ToolAccessMode.AUTHOR) {
-			forumService = getForumManager();
 			ForumToolSession session = forumService.getSessionBySessionId(sessionId);
 			Forum forum = session.getForum();
 			// get session from shared session.
@@ -239,13 +241,15 @@
 					saveErrors(request, errors);
 					// get all root topic to display on init page
 					List rootTopics = forumService.getRootTopics(sessionId);
-					request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics);								
+					request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics);
+					request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID );
 					return mapping.findForward("success");
 				}
 			}
 
 			String nextActivityUrl;
 			try {
+				forumService.finishUserSession(getCurrentUser(request, sessionId));
 				ToolSessionManager sessionMgrService = ForumServiceProxy.getToolSessionManager(getServlet().getServletContext());
 				nextActivityUrl = sessionMgrService.leaveToolSession(sessionId,
 						userID);