contentstorage/srvsrc/casrv.cpp
changeset 102 8b8b34fa9751
parent 98 d2f833ab7940
child 107 b34d53f6acdf
equal deleted inserted replaced
100:0920c6a9b6c8 102:8b8b34fa9751
    22 #include "casrvdef.h"
    22 #include "casrvdef.h"
    23 #include "casrvsession.h"
    23 #include "casrvsession.h"
    24 #include "casrvengutils.h"
    24 #include "casrvengutils.h"
    25 #include "castorageproxy.h"
    25 #include "castorageproxy.h"
    26 #include "casrvmanager.h"
    26 #include "casrvmanager.h"
    27 #include "caprogressnotifier.h"
       
    28 
    27 
    29 // ==================== LOCAL FUNCTIONS ====================
    28 // ==================== LOCAL FUNCTIONS ====================
    30 
    29 
    31 /**
    30 /**
    32  * Create a server.
    31  * Create a server.
   122     while( ( session = iSessionIter++ ) != NULL )
   121     while( ( session = iSessionIter++ ) != NULL )
   123         {
   122         {
   124         delete session;
   123         delete session;
   125         }
   124         }
   126     delete iSrvManager;
   125     delete iSrvManager;
       
   126     iSoftwareRegistry.Close();
   127     delete iSrvEngUtils;
   127     delete iSrvEngUtils;
   128     delete iProgressNotifier;
       
   129     delete iStorageProxy;
   128     delete iStorageProxy;
   130     }
   129     }
   131 
   130 
   132 // ---------------------------------------------------------
   131 // ---------------------------------------------------------
   133 //
   132 //
   154 void CCaSrv::ConstructL()
   153 void CCaSrv::ConstructL()
   155     {
   154     {
   156     iSessionCount = 0;
   155     iSessionCount = 0;
   157     iStorageProxy = CCaStorageProxy::NewL();
   156     iStorageProxy = CCaStorageProxy::NewL();
   158     iSrvEngUtils = CCaSrvEngUtils::NewL();
   157     iSrvEngUtils = CCaSrvEngUtils::NewL();
   159     iProgressNotifier = CCaProgressNotifier::NewL( *iStorageProxy );
   158     User::LeaveIfError( iSoftwareRegistry.Connect() );
   160     iSrvManager = CCaSrvManager::NewL( *iStorageProxy, iSrvEngUtils );
   159     iSrvManager = CCaSrvManager::NewL( *iStorageProxy,
       
   160         &iSoftwareRegistry, iSrvEngUtils);
   161     TInt errCode = iSrvManager->LoadOperationErrorCodeL();
   161     TInt errCode = iSrvManager->LoadOperationErrorCodeL();
   162     if( KSqlErrNotDb <= errCode && errCode <= KSqlErrGeneral )
   162     if( KSqlErrNotDb <= errCode && errCode <= KSqlErrGeneral )
   163         {
   163         {
   164         //problem in loading one of plugins, probably data base is corrupted
   164         //problem in loading one of plugins, probably data base is corrupted
   165         //lets load it from ROM and try again
   165         //lets load it from ROM and try again
   166         delete iSrvManager;
   166         delete iSrvManager;
   167         iSrvManager = NULL;
   167         iSrvManager = NULL;
   168         iStorageProxy->LoadDataBaseFromRomL();
   168         iStorageProxy->LoadDataBaseFromRomL();
   169         iSrvManager = CCaSrvManager::NewL( *iStorageProxy, iSrvEngUtils );
   169         iSrvManager = CCaSrvManager::NewL( *iStorageProxy,
       
   170             &iSoftwareRegistry, iSrvEngUtils );
   170         }
   171         }
   171     }
   172     }
   172 
   173 
   173 // ---------------------------------------------------------
   174 // ---------------------------------------------------------
   174 //
   175 //