diff -r fc7b30ed2058 -r 05bc53fe583b dbcreator/commsdatcreator/Src/cdccommsdatcreator.cpp --- a/dbcreator/commsdatcreator/Src/cdccommsdatcreator.cpp Thu Aug 19 10:18:49 2010 +0300 +++ b/dbcreator/commsdatcreator/Src/cdccommsdatcreator.cpp Tue Aug 31 15:35:44 2010 +0300 @@ -150,8 +150,6 @@ CLOG_WRITE( "Processing started...\n" ) CLOG_WRITE( "=====================\n" ) - iCmManager.OpenL(); - TDbCreatorInputCharSet charSet( ECharSetUnknown );//input character set //Creates access points @@ -303,8 +301,7 @@ iPluginArray, iPluginNames, iDestArray, - iDestNames, - iDefCon ); + iDestNames ); iFileProcessor->ParseFileL(); delete iFileProcessor; @@ -325,7 +322,7 @@ // Updates the IAPs that are not in destinations. - UpdateUncatCmsL( iCmInDest /*, iPluginNames, iPluginArray*/ ); + UpdateUncatCmsL( iCmInDest ); // Sets the underlying IAP/SNAPS for vpn IAPs SetUnderlyingIapL( iUnderLying ); @@ -349,9 +346,6 @@ // Sets linger settings SetLingerSettingsL( iLingerSettings ); - // Sets the default connection - SetDefaultConnectionL( iDefCon ); - // Logs IAPs in UDEB mode #ifdef _DEBUG LogIapIdsL(); @@ -416,8 +410,6 @@ iLingerSettings.ResetAndDestroy(); - iDefCon.ResetAndDestroy(); - iCmInDest.Close(); iCmManager.Close(); @@ -435,7 +427,9 @@ FeatureManager::InitializeLibL(); iIsWlanS = FeatureManager::FeatureSupported( KFeatureIdProtocolWlan ); FeatureManager::UnInitializeLib(); - CLOG_WRITE( "FeatureManager closed\n" ) + CLOG_WRITE( "FeatureManager closed\n" ) + + iCmManager.OpenL(); } //------------------------------------------------ @@ -583,34 +577,6 @@ } } -// --------------------------------------------------------- -// CCdcCommsDatCreator::ProcessDNL -// --------------------------------------------------------- -// -void CCdcCommsDatCreator::SetDefaultConnectionL( RPointerArray< HBufC >& aDefCon ) - { - // Sets the default connection - if( aDefCon.Count() > 0 ) - { - CLOG_WRITE_FORMAT( "SetDefaultConnectionL: %d\n", aDefCon.Count() ) - CLOG_WRITE( "--------------------------------------\n" ) - - CProcessorGlobal* glb = CProcessorGlobal::NewL( iReader, - iCmManager, - iPluginArray, - iPluginNames, - iDestArray, - iDestNames, - aDefCon ); - - CleanupStack::PushL( glb ); - glb->SetDefaultConnectionL(); - - CleanupStack::PopAndDestroy( glb ); - - CLOG_WRITE( "--------------------------------------\n" ) - } - } // --------------------------------------------------------- // CCdcCommsDatCreator::SetUnderlyingIapL