From 07284f19b4121a3e2ad0e72c98fc55ae5675aedc Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 16 Sep 2009 23:47:36 +0000 Subject: [PATCH] Monotone-Parent: f96325bc9b859ddbcc63da21499cf52232a3c494 Monotone-Revision: 615d0049b5d7ae8a1edf8885f3eeccd5f1b83aa5 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-09-16T23:47:36 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ SoObjects/SOGo/SOGoGCSFolder.m | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7d4448532..84d2063cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-09-16 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoGCSFolder.m (-lookupName:inContext:acquire:): + instanciated objects may be queried twice during the same session, + before being saved into the database. Therefore we cache them to + avoid losing their version number. + * UI/WebServerResources/AdministrationUI.js, UI/WebServerResources/ContactsUI.js, UI/WebServerResources/MailerUI.js, diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index ea276d269..817d151ad 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -62,6 +62,7 @@ #import "NSString+DAV.h" #import "DOMNode+SOGo.h" +#import "SOGoCache.h" #import "SOGoContentObject.h" #import "SOGoGroup.h" #import "SOGoParentFolder.h" @@ -591,6 +592,10 @@ static NSArray *childRecordFields = nil; [obj setIsNew: YES]; } } + + if (obj) + [[SOGoCache sharedCache] + registerObject: obj withName: key inContainer: self]; } return obj;