Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r704cc16d46e5a435fceaf9755bec41593613f8ca
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.java	(.../Attachment.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.java	(.../Attachment.java)	(revision 704cc16d46e5a435fceaf9755bec41593613f8ca)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.forum.persistence;
 
 import java.util.Date;
@@ -41,7 +40,7 @@
  *
  *
  */
-public class Attachment implements Cloneable {
+public class Attachment implements Cloneable, Comparable<Attachment> {
     private static final Logger log = Logger.getLogger(Attachment.class);
 
     private Long uid;
@@ -165,4 +164,16 @@
     public void setCreated(Date created) {
 	this.created = created;
     }
+
+    @Override
+    public int compareTo(Attachment o) {
+	if (o == null) {
+	    return 1;
+	}
+	if (this.getUid() != null && o.getUid() != null) {
+	    return (int) (this.getUid() - o.getUid());
+	} else {
+	    return this.getUid() == null ? -1 : 1;
+	}
+    }
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r704cc16d46e5a435fceaf9755bec41593613f8ca
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	(.../Message.java)	(revision 704cc16d46e5a435fceaf9755bec41593613f8ca)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.forum.persistence;
 
 import java.util.Date;
@@ -34,7 +33,6 @@
 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.AttachmentComparator;
 
 /**
  * @author conradb
@@ -70,7 +68,7 @@
     private Set sessionClones;
 
     public Message() {
-	attachments = new TreeSet<Attachment>(new AttachmentComparator());
+	attachments = new TreeSet<Attachment>();
 	sessionClones = new HashSet();
     }
 
@@ -111,7 +109,7 @@
 	    // clone attachment
 	    if (attachments != null) {
 		Iterator iter = attachments.iterator();
-		Set<Attachment> set = new TreeSet<Attachment>(new AttachmentComparator());
+		Set<Attachment> set = new TreeSet<Attachment>();
 		while (iter.hasNext()) {
 		    Attachment file = (Attachment) iter.next();
 		    Attachment newFile = (Attachment) file.clone();
Fisheye: Tag 704cc16d46e5a435fceaf9755bec41593613f8ca 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
===================================================================
diff -u -r6af6a143d4f023e8011080783cb827368ead638e -r704cc16d46e5a435fceaf9755bec41593613f8ca
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 6af6a143d4f023e8011080783cb827368ead638e)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 704cc16d46e5a435fceaf9755bec41593613f8ca)
@@ -21,8 +21,6 @@
  * ****************************************************************
  */
 
-
-
 package org.lamsfoundation.lams.tool.forum.web.actions;
 
 import java.io.IOException;
@@ -66,7 +64,6 @@
 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;
@@ -509,7 +506,7 @@
 	    for (ForumToolSession toolSession : toolSessions) {
 		Message newMsg = Message.newInstance(message);
 		newMsg.setToolSession(toolSession);
-		newMsg.setAttachments(new TreeSet<Attachment>(new AttachmentComparator()));
+		newMsg.setAttachments(new TreeSet<Attachment>());
 		newMsg.setModifiedBy(null);
 		newMsg.setCreatedBy(null);
 		message.getSessionClones().add(newMsg);
@@ -859,7 +856,8 @@
 		    ActionMessage error = new ActionMessage("error.limit.char.less.zero");
 		    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
 		}
-	    }if (!form.getForum().isAllowRichEditor()) {
+	    }
+	    if (!form.getForum().isAllowRichEditor()) {
 		if (form.getForum().getMaxCharacters() != 0
 			&& form.getForum().getMaxCharacters() < form.getForum().getMinCharacters()) {
 		    ActionMessage error = new ActionMessage("error.min.post.char.less");
@@ -871,14 +869,15 @@
 		    ActionMessage error = new ActionMessage("error.limit.char.less.zero");
 		    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
 		}
-	    }if (form.getForum().isAllowRateMessages()) {
+	    }
+	    if (form.getForum().isAllowRateMessages()) {
 		if (form.getForum().getMaximumRate() != 0
 			&& form.getForum().getMaximumRate() < form.getForum().getMinimumRate()) {
 		    ActionMessage error = new ActionMessage("error.min.rate.less.max");
 		    errors.add(ActionMessages.GLOBAL_MESSAGE, error);
 		}
 	    }
-	 
+
 	    if (!form.getForum().isAllowNewTopic()) {
 		if (form.getForum().getMaximumReply() != 0
 			&& form.getForum().getMaximumReply() < form.getForum().getMinimumReply()) {