--- a/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserver.cpp	Tue Apr 27 16:57:49 2010 +0300
+++ b/contentpublishingsrv/contentpublishingserver/cpserver/src/cpserver.cpp	Tue May 11 16:30:05 2010 +0300
@@ -93,7 +93,7 @@
     iBURListener = CCPServerBURListener::NewL(this);
     iCountSession = 0;
     iBURLock = iBURListener->CheckBUR();
-    iDataManager = CCPDataManager::NewL(iBURLock);
+    iDataManager = CCPDataManager::NewL(iDataMapCache, iBURLock);
     iActionHandlerThread = CCPActionHandlerThread::NewL();
     if (!iBURLock)
         {
@@ -123,6 +123,7 @@
 CCPServer::~CCPServer()
     {
     CP_DEBUG( _L8("CCPServer::~CCPServer()" ) );
+    iDataMapCache.Reset();
     for ( TInt i(0); i< iNotifications.Count( ); i++ )
         {
         iNotifications[i]->Close( );
@@ -171,7 +172,7 @@
         }
     else
         {
-        iDataManager->OpenDatabaseL( );
+        iDataManager->OpenDatabaseL(iDataMapCache);
         iBURLock = EFalse;
         }
     }
@@ -194,6 +195,15 @@
     return iNotifications;
     }
 
+// -----------------------------------------------------------------------------
+// CCPServer::GetDataMapCache
+// -----------------------------------------------------------------------------
+//
+TLiwVariant& CCPServer::GetDataMapCache()
+    {
+    return iDataMapCache;
+    }
+
 
 // -----------------------------------------------------------------------------
 // CCPServer::NewSessionL