diff -r 9200f38b1324 -r 042fd2753b8f telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp Wed Sep 15 13:30:43 2010 +0300 +++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp Wed Oct 13 15:51:46 2010 +0300 @@ -1116,10 +1116,10 @@ if((aError == KErrNone) && (aPhonebook != DispatcherPhonebook::EUnknown)) { //fill the CTSY pointer - TRAP ( aError, - CArrayPtrSeg* readEntries = new(ELeave) CArrayPtrSeg(1); - iPhonebookReadPtrs[aPhonebook] = readEntries; - FillCtsyPhoneBookStoreL(aPhonebookEntries,*(iPhonebookReadPtrs[aPhonebook]))); + CArrayPtrSeg* readEntries = new(ELeave) CArrayPtrSeg(1); + iPhonebookReadPtrs[aPhonebook] = readEntries; + + TRAP(aError,FillCtsyPhoneBookStoreL(aPhonebookEntries,*(iPhonebookReadPtrs[aPhonebook]))); } CPhoneBookDataPackage phoneBookDataPackage; @@ -1185,11 +1185,11 @@ if((aError == KErrNone) && (aPhonebook != DispatcherPhonebook::EUnknown)/* && (iPhonebookCachePtrs[aPhonebook])*/) { - TRAP(aError, - CArrayPtrSeg* readEntries = new(ELeave) CArrayPtrSeg(1); - iPhonebookCachePtrs[aPhonebook] = readEntries; - FillCtsyPhoneBookStoreL(aPhonebookEntries, *(iPhonebookCachePtrs[aPhonebook]))); - + CArrayPtrSeg* readEntries = new(ELeave) CArrayPtrSeg(1); + iPhonebookCachePtrs[aPhonebook] = readEntries; + + TRAP(aError,FillCtsyPhoneBookStoreL(aPhonebookEntries, *(iPhonebookCachePtrs[aPhonebook]))); + if(aError) { iPhonebookCachePtrs[aPhonebook]->ResetAndDestroy();