From 93753413f79ba2870112926f3f4eaeb9c9a434d5 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Sun, 4 Nov 2007 19:51:09 +0000 Subject: [PATCH] Monotone-Parent: ccbed15b6f37f75e0bbfa953398b17360efc17dc Monotone-Revision: 2e52dbc1e2c5415cdba61195bc483d77199d3b9c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-11-04T19:51:09 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/SOGo/SOGoFolder.m | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e43917953..c1f79af17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-04 Wolfgang Sourdeau + + * SoObjects/SOGo/SOGoFolder.m ([SOGoFolder + -deleteEntriesWithIds:ids]): make sure the objects returned by + lookupName:... are not instances of NSException. + 2007-11-03 Ludovic Marcotte * UI/Scheduler/UIxAppointmentEditor.m diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m index 4ff6d1e23..3ff95dae3 100644 --- a/SoObjects/SOGo/SOGoFolder.m +++ b/SoObjects/SOGo/SOGoFolder.m @@ -378,7 +378,8 @@ static NSString *defaultUserID = @""; currentID = [ids objectAtIndex: count]; deleteObject = [self lookupName: currentID inContext: context acquire: NO]; - [deleteObject delete]; + if (![deleteObject isKindOfClass: [NSException class]]) + [deleteObject delete]; } }