Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java =================================================================== diff -u -r921d5ae728a6028102ef819609c1317740e1b655 -re4d4a2acc7422eac6d9c5a77e766b0e01baead3e --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java (.../NbAuthoringStarterAction.java) (revision 921d5ae728a6028102ef819609c1317740e1b655) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringStarterAction.java (.../NbAuthoringStarterAction.java) (revision e4d4a2acc7422eac6d9c5a77e766b0e01baead3e) @@ -84,6 +84,7 @@ public final static String FORM="NbAuthoringForm"; + /** * This struts actionservlet gets called when the author double clicks * on the tool icon. If the toolContentId already exists in the tool content @@ -134,9 +135,18 @@ if (!contentExists(nbService, contentId)) { // Pre-fill the form with the default content - NoticeboardContent nb = nbService.retrieveNoticeboard(NoticeboardConstants.DEFAULT_CONTENT_ID); + //NoticeboardContent nb = nbService.retrieveNoticeboard(NoticeboardConstants.DEFAULT_CONTENT_ID); + Long defaultToolContentId = nbService.getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE); + // logger.debug("Default tool content id is " + defaultToolContentId); + NoticeboardContent nb = nbService.retrieveNoticeboard(defaultToolContentId); /** TODO: add a check to see if object is null */ + if (nb==null) + { + String error= "There is data missing in the database"; + logger.error(error); + throw new NbApplicationException(error); + } //create a new noticeboard object and prefill with default content, save to database NoticeboardContent nbContentNew = new NoticeboardContent(contentId,