Remove most pre-sorting in the history service to avoid eliminations.

The sorting introduced in commit 4c665742027d7e89f0c136d1e30ea946be2a1c0f didn't take into account that TreeSet mandates that the ordering "...must be consistent with equals if it is to correctly implement the Set interface.". This was not the case as the comparator only checks for the timestamp of a history event and as such it can have two or more events at exactly the same time (and thus ordering) which would be overwritten in the resulting set.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/net/java/sip/communicator/impl/metahistory/MetaHistoryServiceImpl.java b/src/net/java/sip/communicator/impl/metahistory/MetaHistoryServiceImpl.java
index 78dac57..c8f3543 100644
--- a/src/net/java/sip/communicator/impl/metahistory/MetaHistoryServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/metahistory/MetaHistoryServiceImpl.java
@@ -199,7 +199,7 @@ public class MetaHistoryServiceImpl
         MessageProgressWrapper listenWrapper
             = new MessageProgressWrapper(services.length);
 
-        TreeSet<Object> result = new TreeSet<Object>(new RecordsComparator());
+        LinkedList<Object> result = new LinkedList<Object>();
         for (int i = 0; i < services.length; i++)
         {
             String name = services[i];
@@ -244,6 +244,7 @@ public class MetaHistoryServiceImpl
         }
         listenWrapper.fireLastProgress(startDate, endDate, null);
 
+        Collections.sort(result, new RecordsComparator());
         return result;
     }