From dd7200e00f6d975e8b4d3705745b49fae6509256 Mon Sep 17 00:00:00 2001 From: Kamen Mazdrashki Date: Wed, 7 May 2014 01:26:34 +0200 Subject: [PATCH] openchange/MAPIStoreFolder: Add private selector for actual folder delete action Usually, it is a bad idea for an object to call its own public methods (just like in this case). Thus separating impelementation for deleteFolder: would allow MAPIStoreFolder to call only private implementation when needed Signed-off-by: Kamen Mazdrashki --- OpenChange/MAPIStoreFolder.m | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m index 3dba819b8..a0455efb6 100644 --- a/OpenChange/MAPIStoreFolder.m +++ b/OpenChange/MAPIStoreFolder.m @@ -433,10 +433,16 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe return rc; } -- (int) deleteFolder +- (void) deleteFolderImpl { + // TODO: raise exception in case underlying delete fails? // [propsMessage delete]; [dbFolder delete]; +} + +- (int) deleteFolder +{ + [self deleteFolderImpl]; [self cleanupCaches]; @@ -890,7 +896,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe { fmid = [mapping idFromURL: [self url]]; [mapping unregisterURLWithID: fmid]; - [self deleteFolder]; + [self deleteFolderImpl]; [mapping registerURL: [newFolder url] withID: fmid]; }