Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImpl.java =================================================================== diff -u -r0080bcb9712aa9c559ceb5f509927af142c2dd39 -r68caf9b2d4c0b75203c6957f3383d0731aa3aa87 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImpl.java (.../ForumManagerImpl.java) (revision 0080bcb9712aa9c559ceb5f509927af142c2dd39) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImpl.java (.../ForumManagerImpl.java) (revision 68caf9b2d4c0b75203c6957f3383d0731aa3aa87) @@ -27,14 +27,16 @@ } public Forum createForum(Forum forum, List attachments) throws PersistenceException { - Set documents = new HashSet(); - Iterator it = attachments.iterator(); - while (it.hasNext()) { - Attachment attachment = (Attachment) it.next(); - persistenceDelegate.saveOrUpdate(attachment); - documents.add(attachment); + if (attachments != null && attachments.size() !=0) { + Set documents = new HashSet(); + Iterator it = attachments.iterator(); + while (it.hasNext()) { + Attachment attachment = (Attachment) it.next(); + persistenceDelegate.saveOrUpdate(attachment); + documents.add(attachment); + } + forum.setAttachments(documents); } - forum.setAttachments(documents); persistenceDelegate.saveOrUpdate(forum); return forum; }