Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java,v
diff -u -r1.22 -r1.23
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	23 May 2006 12:48:53 -0000	1.22
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	23 May 2006 13:28:28 -0000	1.23
@@ -89,6 +89,7 @@
     public static final String MAX_OPTION_INDEX 						= "maxOptionIndex";
     public static final String COPY_TOOL_CONTENT 						= "copyToolContent";
     public static final String REMOVE_TOOL_CONTENT 						= "removeToolContent";
+    public static final String OPT_INDEX 								= "optIndex";
     
     /*
      * refers to number of questions presented initially, we have a single record for default content
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java	16 May 2006 17:39:26 -0000	1.3
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java	23 May 2006 13:28:28 -0000	1.4
@@ -26,20 +26,59 @@
 
 import javax.servlet.http.HttpSession;
 
+import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
 
 /**
  * This class give a chance to clear HttpSession when user save/close authoring page.
  * @author Steve.Ni
  * 
  * @version $Revision$
+ * @author Ozgur Demirtas
  */
-public class ClearSessionAction extends LamsAuthoringFinishAction {
+public class ClearSessionAction extends LamsAuthoringFinishAction implements VoteAppConstants {
 
 
 	public void clearSession(HttpSession session, ToolAccessMode mode) {
+	    session.removeAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG);
 		if(mode.isAuthor()){
+		    session.removeAttribute(TOOL_SERVICE);
+		    session.removeAttribute(ACTIVE_MODULE);
+		    session.removeAttribute(DEFINE_LATER_IN_EDIT_MODE);
+		    session.removeAttribute(TOOL_CONTENT_ID);
+		    session.removeAttribute(DEFAULT_CONTENT_ID);
+		    session.removeAttribute(DEFAULT_CONTENT_ID_STR);
+		    session.removeAttribute(LIST_UPLOADED_OFFLINE_FILENAMES);
+		    session.removeAttribute(LIST_UPLOADED_ONLINE_FILENAMES);
+		    session.removeAttribute(LIST_OFFLINEFILES_METADATA);
+		    session.removeAttribute(LIST_ONLINEFILES_METADATA);
+		    session.removeAttribute(IS_DEFINE_LATER);
+		    session.removeAttribute(REMOVABLE_QUESTION_INDEX);
+		    session.removeAttribute(ACTIVITY_TITLE);
+		    session.removeAttribute(ACTIVITY_INSTRUCTIONS);
+		    session.removeAttribute(DEFAULT_OPTION_CONTENT);
+		    session.removeAttribute(MAP_OPTIONS_CONTENT);
+		    session.removeAttribute(MAX_OPTION_INDEX);
+		    session.removeAttribute(RICHTEXT_OFFLINEINSTRUCTIONS);
+		    session.removeAttribute(RICHTEXT_ONLINEINSTRUCTIONS);
+		    session.removeAttribute(LIST_OFFLINEFILES_METADATA);
+		    session.removeAttribute(LIST_UPLOADED_OFFLINE_FILENAMES);
+		    session.removeAttribute(LIST_ONLINEFILES_METADATA);
+		    session.removeAttribute(LIST_UPLOADED_ONLINE_FILENAMES);
+		    session.removeAttribute(EDITACTIVITY_EDITMODE);
+		    session.removeAttribute(LIST_UPLOADED_ONLINE_FILENAMES);
+		    session.removeAttribute(ATTACHMENT_LIST);
+		    session.removeAttribute(DELETED_ATTACHMENT_LIST);
+		    session.removeAttribute(IS_MONITORED_CONTENT_IN_USE);
+		    session.removeAttribute(OPT_INDEX);
+		    session.removeAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP);
+		    session.removeAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS);
+		    session.removeAttribute(USER_EXCEPTION_CONTENT_IN_USE);
+		    session.removeAttribute(USER_EXCEPTION_CONTENTID_REQUIRED);
+		    session.removeAttribute(USER_EXCEPTION_FILENAME_EMPTY);
+		    session.removeAttribute(USER_EXCEPTION_NUMBERFORMAT);
 		}
 	}