Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java =================================================================== diff -u -rcea445ecc91b0a6d738ad7123d90a4080f97f288 -r936f6745af8545e1be643888d6d717484ae8c76e --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java (.../NbAuthoringAction.java) (revision cea445ecc91b0a6d738ad7123d90a4080f97f288) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java (.../NbAuthoringAction.java) (revision 936f6745af8545e1be643888d6d717484ae8c76e) @@ -28,7 +28,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.apache.struts.actions.LookupDispatchAction; +//import org.apache.struts.actions.LookupDispatchAction; +import org.lamsfoundation.lams.web.action.LamsLookupDispatchAction; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -50,14 +51,19 @@ * type="org.lamsfoundation.lams.tool.noticeboard.web.NbAuthoringAction" * parameter="method" * + * @struts.action-exception key="error.exception.NbApplication" scope="request" + * type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException" + * path=".error" + * handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler" + * * @struts:action-forward name="basic" path=".nb_basic" * @struts:action-forward name="advanced" path=".nb_advanced" * @struts:action-forward name="instructions" path=".nb_instructions" * * ----------------XDoclet Tags-------------------- */ -public class NbAuthoringAction extends LookupDispatchAction { +public class NbAuthoringAction extends LamsLookupDispatchAction { static Logger logger = Logger.getLogger(NbAuthoringAction.class.getName()); @@ -127,6 +133,13 @@ copyInstructionFormProperty(request, nbForm); INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext()); + String idAsString = nbForm.getToolContentId(); + if (idAsString == null) + { + String error = "Unable to continue. Tool content id missing"; + logger.error(error); + throw new NbApplicationException(error); + } Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentId()); //throws exception if the content id does not exist @@ -153,7 +166,7 @@ { if (contentId == null) { - String error = "Tool content id missing. Unable to continue."; + String error = "Unable to continue. Tool content id missing."; throw new NbApplicationException(error); }