diff -r 8dc8494f1e0e -r 839ea9debada traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp --- a/traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp Wed Sep 15 14:05:58 2010 +0300 +++ b/traceservices/tracefw/ulogger/src/uloggerserver/uloggerserver.cpp Wed Oct 13 16:30:44 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -33,18 +33,6 @@ namespace Ulogger { -void CleanupPointerArray( TAny* aArray ) - { - static_cast< RPointerArray< TPluginConfiguration >* >( aArray )->ResetAndDestroy(); - static_cast< RPointerArray< TPluginConfiguration >* >( aArray )->Close(); - } - -void CleanupResetAndDestroyPushL( RPointerArray< TPluginConfiguration >& aArray ) - { - TCleanupItem item( CleanupPointerArray, &aArray ); - CleanupStack::PushL( item ); - } - /*Default constructor*/ CULoggerServer::CULoggerServer(TInt aPriority) : CServer2( aPriority ) @@ -1160,23 +1148,20 @@ } } + void CULoggerServer::InitializeFrameworksL() { // //output settings RBuf8 outPluginName; outPluginName.Create(KMaxPluginName); - outPluginName.CleanupClosePushL(); RPointerArray outputPluginSettings; - CleanupResetAndDestroyPushL(outputPluginSettings); GetPluginAndSettingsL(outPluginName, &outputPluginSettings, EOutputPluginFilter); //control settings RBuf8 inputPluginName; inputPluginName.Create(KMaxPluginName); - inputPluginName.CleanupClosePushL(); RPointerArray inputPluginSettings; - CleanupResetAndDestroyPushL(inputPluginSettings); this->GetPluginAndSettingsL(inputPluginName, &inputPluginSettings, EInputPluginFilter); #if defined(__LIGHTLOGGER_ENABLED) && defined(__VERBOSE_MODE) @@ -1199,8 +1184,14 @@ iInputFramework = CInputFramework::NewL(iPluginAllocator->GetInputPlugin(), inputPluginSettings, this); //cleanup - CleanupStack::PopAndDestroy(4,&outPluginName); - iDataWatcher = CULoggerWatcher::NewL(); + outPluginName.Close(); + outputPluginSettings.ResetAndDestroy(); + outputPluginSettings.Close(); + inputPluginName.Close(); + inputPluginSettings.ResetAndDestroy(); + inputPluginSettings.Close(); + + iDataWatcher = CULoggerWatcher::NewL(); }