Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java,v
diff -u -r1.6.18.1 -r1.6.18.2
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	18 Mar 2010 12:14:52 -0000	1.6.18.1
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java	5 Apr 2010 14:30:00 -0000	1.6.18.2
@@ -124,7 +124,7 @@
 	    nextUrl = WebUtil.appendParameterToURL(nextUrl, RE_EDIT_URL, URLEncoder.encode(reeditUrl, "UTF-8"));
 	    response.sendRedirect(nextUrl);
 	}
-	if (StringUtils.equals(action, CANCEL_ACTION) || StringUtils.equals(ToolAccessMode.TEACHER.toString(), modeStr)) {
+	if (StringUtils.equals(action, CANCEL_ACTION) && StringUtils.equals(ToolAccessMode.TEACHER.toString(), modeStr)) {
 	    String signature = request.getParameter(TOOL_SIGNATURE);
 	    Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));