Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.34 -r1.35
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	15 Jun 2006 04:04:37 -0000	1.34
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	15 Jun 2006 04:31:13 -0000	1.35
@@ -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);
 		}