From 97201c56a45ac51ea744fe85ca4e875a87c5fe68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Garc=C3=ADa=20S=C3=A1ez?= <jgarcia@zentyal.com>
Date: Mon, 1 Dec 2014 10:47:16 +0100
Subject: [PATCH] abort if attemp to sync an UID in setChangekey fails

---
 OpenChange/MAPIStoreMailFolder.m | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m
index 6140eb141..58cab6105 100644
--- a/OpenChange/MAPIStoreMailFolder.m
+++ b/OpenChange/MAPIStoreMailFolder.m
@@ -855,8 +855,11 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
       synced = [self synchroniseCacheForUID: messageUid];
       if (synced)
         messageEntry = [[[versionsMessage properties] objectForKey: @"Messages"] objectForKey: messageUid];
-      else
-        abort ();
+      if (!messageEntry)
+        {
+          [self errorWithFormat: @"still nothing. We crash!"];
+          abort ();
+        }
     }
   [self _setChangeKey: changeKey forMessageEntry: messageEntry];