Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java =================================================================== diff -u -r0cae9f7a40ca2fd2c14a2d27f9c016cf7d708882 -rc92fdf440219cca0ca62951bf4a08a3137100356 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision 0cae9f7a40ca2fd2c14a2d27f9c016cf7d708882) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision c92fdf440219cca0ca62951bf4a08a3137100356) @@ -348,6 +348,10 @@ forumService.createRootTopic(forumId, sessionId, message); // echo back current root topic to fourm init page + Forum forum = forumService.getForum(forumId); + request.setAttribute(ForumConstants.ATTR_FORUM_TITLE,forum.getTitle()); + request.setAttribute(ForumConstants.ATTR_FORUM_INSTRCUTION,forum.getInstructions()); + List rootTopics = forumService.getRootTopics(sessionId); request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics); return mapping.findForward("success"); @@ -502,6 +506,7 @@ Long rootTopicId = forumService.getRootTopicId(topicId); List msgDtoList = forumService.getTopicThread(rootTopicId); setAuthorMark(msgDtoList); + request.setAttribute(ForumConstants.AUTHORING_TOPIC_THREAD, msgDtoList); return mapping.findForward("success"); @@ -584,7 +589,9 @@ } messagePO.setUpdated(new Date()); messagePO.setModifiedBy(getCurrentUser(request)); - messagePO.setAttachments(null); + Set atts = messagePO.getAttachments(); + if(atts != null) + atts.clear(); if ( makeAuditEntry ) { forumService.getAuditService().logChange(ForumConstants.TOOL_SIGNATURE, @@ -694,8 +701,11 @@ forumService = getForumManager(); Attachment att = forumService.uploadAttachment(messageForm .getAttachmentFile()); + Set attSet = message.getAttachments(); + if(attSet == null) + attSet = new HashSet(); // only allow one attachment, so replace whatever - Set attSet = attSet = new HashSet(); + attSet.clear(); attSet.add(att); message.setAttachments(attSet); }