From 4f9b5da77e75b6006df364288568d191ce526d0b Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 28 Jul 2011 00:45:35 +0000
Subject: [PATCH] Monotone-Parent: da065094ec85a862e2b55a9d2a9344f023a1495d
 Monotone-Revision: 52e43d7be78f6de53ec604ed8975953bce6b1e0d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-28T00:45:35
Monotone-Branch: ca.inverse.sogo
---
 OpenChange/MAPIStoreFolder.m | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 4ffe8aff5..cc2b2368e 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -288,7 +288,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
              withRow: (struct SRow *) aRow
               andFID: (uint64_t) fid
 {
-  int rc;
+  int rc = MAPISTORE_SUCCESS;
   MAPIStoreMapping *mapping;
   NSString *baseURL, *childURL, *folderKey;
   MAPIStoreFolder *childFolder;
@@ -316,7 +316,6 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
             {
               [childFolder setProperties: aRow];
               *childFolderPtr = childFolder;
-              rc = MAPISTORE_SUCCESS;
             }
           else
             [NSException raise: @"MAPIStoreIOException"
@@ -351,6 +350,11 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
     keys = [self folderKeys];
   else if (tableType == MAPISTORE_FAI_TABLE)
     keys = [self faiMessageKeys];
+  else
+    {
+      keys = nil;
+      rc = MAPISTORE_ERR_NOT_FOUND;
+    }
   *rowCount = [keys count];
 
   return rc;