Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java,v
diff -u -r1.40.2.1 -r1.40.2.2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	1 Feb 2015 22:02:26 -0000	1.40.2.1
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	21 May 2015 04:05:49 -0000	1.40.2.2
@@ -34,7 +34,7 @@
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.tool.forum.util.ForumToolContentHandler;
+import org.lamsfoundation.lams.tool.forum.util.AttachmentComparator;
 
 /**
  * @author conradb
@@ -70,7 +70,7 @@
     private Set sessionClones;
 
     public Message() {
-	attachments = new TreeSet();
+	attachments = new TreeSet<Attachment>(new AttachmentComparator());
 	sessionClones = new HashSet();
     }
 
@@ -110,7 +110,7 @@
 	    // clone attachment
 	    if (attachments != null) {
 		Iterator iter = attachments.iterator();
-		Set set = new TreeSet();
+		Set<Attachment> set = new TreeSet<Attachment>(new AttachmentComparator());
 		while (iter.hasNext()) {
 		    Attachment file = (Attachment) iter.next();
 		    Attachment newFile = (Attachment) file.clone();
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/AttachmentComparator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java,v
diff -u -r1.82.2.2 -r1.82.2.3
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	16 Apr 2015 14:04:23 -0000	1.82.2.2
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	21 May 2015 04:05:49 -0000	1.82.2.3
@@ -68,6 +68,7 @@
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
 import org.lamsfoundation.lams.tool.forum.persistence.PersistenceException;
 import org.lamsfoundation.lams.tool.forum.service.IForumService;
+import org.lamsfoundation.lams.tool.forum.util.AttachmentComparator;
 import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
 import org.lamsfoundation.lams.tool.forum.util.ForumWebUtils;
 import org.lamsfoundation.lams.tool.forum.util.MessageComparator;
@@ -510,7 +511,7 @@
 	    for (ForumToolSession toolSession : toolSessions) {
 		Message newMsg = Message.newInstance(message);
 		newMsg.setToolSession(toolSession);
-		newMsg.setAttachments(new TreeSet());
+		newMsg.setAttachments(new TreeSet<Attachment>(new AttachmentComparator()));
 		newMsg.setModifiedBy(null);
 		newMsg.setCreatedBy(null);		
 		message.getSessionClones().add(newMsg);