From 27613474ac441a018c106fc81aa2098d70371bfb Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 4 Jun 2009 18:56:06 +0000 Subject: [PATCH] Monotone-Parent: 69bdee75f2d2b26ac2ca5a3bb53a6a43becfcb06 Monotone-Revision: 7e8a884a4d8254949154e9c2650acb95f5c3565a Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-06-04T18:56:06 Monotone-Branch: ca.inverse.sogo --- SoObjects/SOGo/SOGoCache.m | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/SoObjects/SOGo/SOGoCache.m b/SoObjects/SOGo/SOGoCache.m index 578fba908..7d111f972 100644 --- a/SoObjects/SOGo/SOGoCache.m +++ b/SoObjects/SOGo/SOGoCache.m @@ -208,18 +208,22 @@ static NSLock *lock; NSMutableArray *names; id currentObject; - names = [NSMutableArray new]; - - [names addObject: name]; - currentObject = container; - while ((nameInContainer = [currentObject nameInContainer])) + if ([name length]) { - [names addObject: nameInContainer]; - currentObject = [currentObject container]; - } + names = [NSMutableArray array]; - fullPath = [names componentsJoinedByString: @"/"]; - [names release]; + [names addObject: name]; + currentObject = container; + while ((nameInContainer = [currentObject nameInContainer])) + { + [names addObject: nameInContainer]; + currentObject = [currentObject container]; + } + + fullPath = [names componentsJoinedByString: @"/"]; + } + else + fullPath = nil; return fullPath; }