Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/util/TaskListItemAttachmentComparator.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc2d8c54fc7d9c6eb52f08ef229e2a2eae448a248 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/util/TaskListItemAttachmentComparator.java (.../TaskListItemAttachmentComparator.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/util/TaskListItemAttachmentComparator.java (.../TaskListItemAttachmentComparator.java) (revision c2d8c54fc7d9c6eb52f08ef229e2a2eae448a248) @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.taskList.util; import java.util.Comparator; @@ -40,7 +39,13 @@ @Override public int compare(TaskListItemAttachment o1, TaskListItemAttachment o2) { if (o1 != null && o2 != null) { - return o1.getCreated().compareTo(o2.getCreated()); + int timestampComparision = o1.getCreated().compareTo(o2.getCreated()); + if (timestampComparision == 0) { + return o1.getUid() == null ? (o2.getUid() == null ? 0 : -1) + : (o2.getUid() == null ? 1 : o1.getUid().compareTo(o2.getUid())); + } else { + return timestampComparision; + } } else if (o1 != null) { return 1; } else {