diff -r 1ac40e087278 -r 17af172ffa5f telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp Thu Jul 15 19:58:53 2010 +0300 +++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp Thu Aug 19 11:03:36 2010 +0300 @@ -1116,10 +1116,10 @@ if((aError == KErrNone) && (aPhonebook != DispatcherPhonebook::EUnknown)) { //fill the CTSY pointer - CArrayPtrSeg* readEntries = new(ELeave) CArrayPtrSeg(1); - iPhonebookReadPtrs[aPhonebook] = readEntries; - - TRAP(aError,FillCtsyPhoneBookStoreL(aPhonebookEntries,*(iPhonebookReadPtrs[aPhonebook]))); + TRAP ( aError, + CArrayPtrSeg* readEntries = new(ELeave) CArrayPtrSeg(1); + iPhonebookReadPtrs[aPhonebook] = readEntries; + FillCtsyPhoneBookStoreL(aPhonebookEntries,*(iPhonebookReadPtrs[aPhonebook]))); } CPhoneBookDataPackage phoneBookDataPackage; @@ -1185,11 +1185,11 @@ if((aError == KErrNone) && (aPhonebook != DispatcherPhonebook::EUnknown)/* && (iPhonebookCachePtrs[aPhonebook])*/) { - CArrayPtrSeg* readEntries = new(ELeave) CArrayPtrSeg(1); - iPhonebookCachePtrs[aPhonebook] = readEntries; - - TRAP(aError,FillCtsyPhoneBookStoreL(aPhonebookEntries, *(iPhonebookCachePtrs[aPhonebook]))); - + TRAP(aError, + CArrayPtrSeg* readEntries = new(ELeave) CArrayPtrSeg(1); + iPhonebookCachePtrs[aPhonebook] = readEntries; + FillCtsyPhoneBookStoreL(aPhonebookEntries, *(iPhonebookCachePtrs[aPhonebook]))); + if(aError) { iPhonebookCachePtrs[aPhonebook]->ResetAndDestroy();