From 3274bd1f4c6d549afc3cca4dc35a2ae55ccb33e8 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 22 Feb 2012 14:44:22 +0000 Subject: [PATCH] Monotone-Parent: 64241052c164949118642194441e9a30cbdc3d58 Monotone-Revision: 53ba3739a8b7ce64040a91695b40bad1a7d7e1aa Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-02-22T14:44:22 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/SOGo/SQLSource.m | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 34a900d49..2f26a9e25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-02-22 Wolfgang Sourdeau + + * SoObjects/SOGo/SQLSource.m (_lookupContactEntry:considerEmail:): + make sure the value of column pointer to by _kindField is not nil, + nor an NSNull instance before treating it like a string. + 2012-02-21 Wolfgang Sourdeau * SoObjects/SOGo/SOGoSQLUserProfile.m (-fetchJSONProfileFromDB): diff --git a/SoObjects/SOGo/SQLSource.m b/SoObjects/SOGo/SQLSource.m index 59bdf969e..ebdc229c0 100644 --- a/SoObjects/SOGo/SQLSource.m +++ b/SoObjects/SOGo/SQLSource.m @@ -552,7 +552,7 @@ // We check if it's a resource of not if (_kindField) { - if ((value = [response objectForKey: _kindField])) + if ((value = [response objectForKey: _kindField]) && [value isNotNull]) { if ([value caseInsensitiveCompare: @"location"] == NSOrderedSame || [value caseInsensitiveCompare: @"thing"] == NSOrderedSame ||