Monotone-Parent: f4e8a715d67a12fea729843b1401f636ce05ed66

Monotone-Revision: 86ef6adf2b0443af39cafaac0b9a9d66fb753576

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-16T21:09:10
Monotone-Branch: ca.inverse.sogo

OpenChange/MAPIStoreGCSFolder.m

@@ -527,9 +527,10 @@ static Class NSNumberK;
 
 - (NSData *) predecessorChangeListForMessageWithKey: (NSString *) messageKey
 {
-  NSMutableData *changeKeys = nil;
+  NSMutableData *list = nil;
   NSDictionary *messages, *changeListDict;
   NSArray *keys;
+  NSMutableArray *changeKeys;
   NSUInteger count, max;
   NSData *changeKey;
   NSString *guid;
@@ -540,21 +541,30 @@ static Class NSNumberK;
                      objectForKey: @"PredecessorChangeList"];
   if (changeListDict)
     {
-      changeKeys = [NSMutableData data];
       keys = [changeListDict allKeys];
       max = [keys count];
 
+      changeKeys = [NSMutableArray arrayWithCapacity: max];
       for (count = 0; count < max; count++)
         {
           guid = [keys objectAtIndex: count];
           globCnt = [changeListDict objectForKey: guid];
           changeKey = [NSData dataWithChangeKeyGUID: guid andCnt: globCnt];
-          [changeKeys appendUInt8: [changeKey length]];
-          [changeKeys appendData: changeKey];
+          [changeKeys addObject: changeKey];
+        }
+      [changeKeys sortUsingFunction: MAPIChangeKeyGUIDCompare
+                            context: nil];
+
+      list = [NSMutableData data];
+      for (count = 0; count < max; count++)
+        {
+          changeKey = [changeKeys objectAtIndex: count];
+          [list appendUInt8: [changeKey length]];
+          [list appendData: changeKey];
         }
     }
 
-  return changeKeys;
+  return list;
 }
 
 - (NSArray *) getDeletedKeysFromChangeNumber: (uint64_t) changeNum