From 545a143c7dd36061dcf5a832f60e4c4fa171153c Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 29 Jun 2007 22:10:52 +0000 Subject: [PATCH] Monotone-Parent: d4b0b7bfea3f5d0389c4d53585ed513810a5dd8e Monotone-Revision: c3bd0a3d6929473b847955d02a59506bd78f6b42 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-29T22:10:52 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ SoObjects/SOGo/AgenorUserDefaults.m | 16 +++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6af7e639..176fc0041 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2007-06-29 Wolfgang Sourdeau + * SoObjects/SOGo/AgenorUserDefaults.m ([AgenorUserDefaults + -generateSQLForInsert]): initialize error to nil before the + serialization. Otherwise the method can get confused if it ever is + initialized to something else. + * SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder -folderIsMandatory]): returns NO unconditionnally. diff --git a/SoObjects/SOGo/AgenorUserDefaults.m b/SoObjects/SOGo/AgenorUserDefaults.m index c1104ceb0..10b88155e 100644 --- a/SoObjects/SOGo/AgenorUserDefaults.m +++ b/SoObjects/SOGo/AgenorUserDefaults.m @@ -193,18 +193,23 @@ static NSString *uidColumnName = @"uid"; @" VALUES ('%@', '%@')"), [[self tableURL] gcsTableName], uidColumnName, fieldName, [self uid], - [serializedDefaults stringByReplacingString:@"'" withString:@"''"]]; + [serializedDefaults stringByReplacingString: @"'" + withString:@"''"]]; #else NSData *serializedDefaultsData; NSString *error; + error = nil; serializedDefaultsData = [NSPropertyListSerialization dataFromPropertyList: values format: NSPropertyListOpenStepFormat errorDescription: &error]; if (error) - sql = nil; + { + sql = nil; + [error release]; + } else { serializedDefaults = [[NSString alloc] initWithData: serializedDefaultsData @@ -242,11 +247,11 @@ static NSString *uidColumnName = @"uid"; NSData *serializedDefaultsData; NSString *error; + error = nil; serializedDefaultsData = [NSPropertyListSerialization dataFromPropertyList: values format: NSPropertyListOpenStepFormat errorDescription: &error]; - error = nil; if (error) { sql = nil; @@ -262,7 +267,8 @@ static NSString *uidColumnName = @"uid"; @" WHERE %@ = '%@'"), [[self tableURL] gcsTableName], fieldName, - [serializedDefaults stringByReplacingString:@"'" withString:@"''"], + [serializedDefaults stringByReplacingString: @"'" + withString: @"''"], uidColumnName, [self uid]]; [serializedDefaults release]; } @@ -393,7 +399,7 @@ static NSString *uidColumnName = @"uid"; /* ensure fetched data (more or less guaranteed by modified!=0) */ if (![self fetchProfile]) return NO; - + /* store */ if (![self primaryStoreProfile]) {