diff -r cfd5c2994f10 -r 113b91e0a2ad ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp --- a/ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp Tue Aug 31 15:31:29 2010 +0300 +++ b/ximpfw/presence/srcpresencecache/presencecacheserver/presencecacheservicestore.cpp Wed Sep 01 12:27:45 2010 +0100 @@ -137,10 +137,10 @@ TInt CPresenceCacheServiceStore::AddBlind(CPresenceCacheBuddyStore* aBuddyStore) { TRACE( _L("CPresenceCacheServiceStore::AddBlind - begin") ); - if(aBuddyStore) - TRACE_1( _L("______identity: %S"), &(aBuddyStore->BuddyId()->Identity())); - else - return KErrArgument; + TRACE_1( _L("______identity: %S"), &(aBuddyStore->BuddyId()->Identity())); + + if(!aBuddyStore) + return KErrArgument; iBuddyStoreCollection.Append(aBuddyStore); @@ -163,16 +163,13 @@ (MPresenceBuddyInfo* aBuddyPresInfo) { TRACE( _L("CPresenceCacheServiceStore::AddOrReplacePresence - begin") ); - + TRACE_1( _L("______identity: %S"), &(aBuddyPresInfo->BuddyId()->Identity())); CPresenceCacheBuddyStore* newBuddyStore(NULL); - if(aBuddyPresInfo) - TRACE_1( _L("______identity: %S"), &(aBuddyPresInfo->BuddyId()->Identity())); - else - { - return newBuddyStore; - } + if(!aBuddyPresInfo) + return newBuddyStore; + TBool oldPresExists(EFalse); TInt count = iBuddyStoreCollection.Count();