diff -r 3b0cec605979 -r c5b848e6c7d1 cmmanager/cmmgr/cmmserver/src/cmmanagerimpl.cpp --- a/cmmanager/cmmgr/cmmserver/src/cmmanagerimpl.cpp Thu May 27 14:35:19 2010 +0300 +++ b/cmmanager/cmmgr/cmmserver/src/cmmanagerimpl.cpp Thu Jun 10 16:00:16 2010 +0300 @@ -70,6 +70,8 @@ if ( iIsFeatureManagerInitialised ) { + // Feature manager must not be uninitialized earlier. Plugins must be + // able to use it. FeatureManager::UnInitializeLib(); } @@ -107,6 +109,8 @@ { OstTraceFunctionEntry0( CCMMANAGERIMPL_CONSTRUCTL_ENTRY ); + // Feature Manager is initialized here, and it can be used by plugins also. + // It is uninitialized in destructor. FeatureManager::InitializeLibL(); iIsFeatureManagerInitialised = ETrue; iWLanSupport = FeatureManager::FeatureSupported( KFeatureIdProtocolWlan ); @@ -133,22 +137,22 @@ TInt err( 0 ); - TRAP( err, iSnapTableId = CCDDataMobilitySelectionPolicyRecord::TableIdL( iTrans->Session() )); + TRAP( err, iBearerPriorityTableId = + CCDGlobalBearerTypePriorizationRecord::TableIdL( iTrans->Session() ) ); if ( err == KErrNotFound ) { - iSnapTableId = CCDDataMobilitySelectionPolicyRecord::CreateTableL( iTrans->Session() ); + iBearerPriorityTableId = + CCDGlobalBearerTypePriorizationRecord::CreateTableL( iTrans->Session() ); } else { User::LeaveIfError( err ); } - TRAP( err, iBearerPriorityTableId = - CCDGlobalBearerTypePriorizationRecord::TableIdL( iTrans->Session() ) ); + TRAP( err, iSnapTableId = CCDDataMobilitySelectionPolicyRecord::TableIdL( iTrans->Session() )); if ( err == KErrNotFound ) { - iBearerPriorityTableId = - CCDGlobalBearerTypePriorizationRecord::CreateTableL( iTrans->Session() ); + iSnapTableId = CCDDataMobilitySelectionPolicyRecord::CreateTableL( iTrans->Session() ); } else {