From bb9c4cf0396cef689dde5400e9d28409780c7e2a Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Mon, 13 Jan 2014 16:24:15 -0500
Subject: [PATCH] Handle not found objects and correctly get all "Collection"

---
 ActiveSync/SOGoActiveSyncDispatcher+Sync.m | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
index 27f89d5cb..010c1f30d 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
@@ -318,6 +318,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                                        inContext: context
                                          acquire: NO];
 
+          // Object was removed inbetween sync/commands?
+          if ([sogoObject isKindOfClass: [NSException class]])
+            {
+              // FIXME - return status == 8
+              continue;
+            }
+          
           switch (theFolderType)
             {
             case ActiveSyncContactFolder:
@@ -903,7 +910,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   [s appendString: @"<!DOCTYPE ActiveSync PUBLIC \"-//MICROSOFT//DTD ActiveSync//EN\" \"http://www.microsoft.com/\">"];
   [s appendString: @"<Sync xmlns=\"AirSync:\"><Collections>"];
 
-  allCollections = (id)[theDocumentElement getElementsByTagName: @"Collections"];
+  allCollections = (id)[theDocumentElement getElementsByTagName: @"Collection"];
 
   for (i = 0; i < [allCollections count]; i++)
     {