diff -r 000000000000 -r 3553901f7fa8 telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsywithdispatcher.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsywithdispatcher.cpp	Tue Feb 02 01:41:59 2010 +0200
@@ -0,0 +1,101 @@
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifdef USING_CTSY_DISPATCHER
+
+/**
+ * This file contains additional function definitions for the CMmPhoneBookStoreTsy class
+ * in CTSY for use when the CTSY is used with the CTSY Dispatcher. 
+ */
+
+// INCLUDE FILES
+
+#include "cmmphonebookstoretsy.h"
+#include "cmmphonebookstoreextinterface.h"
+#include <ctsy/serviceapi/mmtsy_ipcdefs.h>
+#include "cmmphonetsy.h"
+
+// ---------------------------------------------------------------------------
+// CMmPhoneBookStoreTsy::CacheEntriesL
+// This method activates phonebook entry caching.
+// if phonebook initialization is not done, it is done first.
+// (other items were commented in a header).
+// ---------------------------------------------------------------------------
+//
+
+//need to replace the whole function as the change is in a TRAPD which itself is a MACRO thus cannot ifdef
+
+
+void CMmPhoneBookStoreTsy::CacheEntriesL()
+    {
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - entered");
+    // Get Phonebook related DLL -static data
+
+    // Check if phonebook has been initialized successfully. Caching of ADN
+    // entries does not work if phonebook initialize have been failed.
+    if ( iStoreInfoData->iIsPhonebookInitialized &&
+         ( EFalse == iStoreInfoData->iIsPhonebookInitializeFailed ||
+           KADNPhoneBook != iPhoneBookType ) )
+        {
+        TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Cache PB %S ", &iPhoneBookName);
+        TInt ret = KErrNone;
+		CMmPhoneTsy::CNosBootState* bootState = iMmPhoneTsy->NosBootState();
+		
+		if ( !iCacheReady )
+			{
+			// Check if SIM is ready, and SMS has been cached already
+			if ( ( KADNPhoneBook == iPhoneBookType ) ||
+				 ( KFDNPhoneBook == iPhoneBookType ) &&
+				 ( EFalse != bootState->iSIMReady ) )
+				{
+				// Cache must be reseted after the boot
+				if ( NULL != iPBStoreCache )
+					{
+					iPBStoreCache->ResetAndDestroy();
+					delete iPBStoreCache;
+					iPBStoreCache = NULL;
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Old cache deleted");
+					}
+				
+				//Inform phonebook that the cache is not ready for refresh
+				ResetCacheReady();
+	
+				bootState->iCachingActive = ETrue;
+				TRAP( ret, ReadToCacheL();)
+				}
+			}
+            else if ( iCacheReady )
+                {
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S cache entries ready", &iPhoneBookName);
+                }
+        if ( KErrNone != ret)
+            {
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S caching failed!", &iPhoneBookName);
+            }
+        }
+    // Phonebook not initialized -> let's do it before caching
+    else if ( ( !iStoreInfoData->iIsPhonebookInitialized
+        || iStoreInfoData->iIsPhonebookInitializeFailed )
+        && !iMmPhoneTsy->IsPBInitActive() )
+        {
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Starting initialization PB: %S", &iPhoneBookName);
+        // before phonebook requests, phonebook must be initialized
+        iMmPhoneBookStoreExtInterface->InitPhonebook(
+            EMmTsyPhoneBookStoreInitIPC, iPhoneBookName );
+        iMmPhoneTsy->SetPBInitActiveStatus( ETrue );
+        }
+    }
+
+#endif //USING_CTSY_DISPATCHER