diff -r eedf17a17c27 -r cfd5c2994f10 brandingserver/bsserver/cbssession.cpp --- a/brandingserver/bsserver/cbssession.cpp Thu Aug 19 10:14:19 2010 +0300 +++ b/brandingserver/bsserver/cbssession.cpp Tue Aug 31 15:31:29 2010 +0300 @@ -2,7 +2,7 @@ * Copyright (c) 2006 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" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * @@ -11,18 +11,19 @@ * * Contributors: * -* Description: CBSSession.cpp +* Description: CBSSession.cpp * */ + // INCLUDE FILES #include #include #include "cbssession.h" #include "cbsserver.h" -#include "debugtrace.h" +#include "DebugTrace.h" #include "cbsbrandhandler.h" #include "cbsstoragemanager.h" #include "cbsstorage.h" @@ -72,10 +73,6 @@ delete iBuffer; delete iBranding; delete iSeveralData; - - delete iApplicationId; - delete iBrandId; - delete iDefaultBrandId; #ifdef __WINSCW__ if( iStorageManager ) @@ -511,8 +508,7 @@ { TRACE( T_LIT("CBSSession::InitUpdateL: Brand discarded!->LeaveWith KErrNotFound") ); ///Server()->DisplaySessionInfoL( this, KErrNotFound ); - //User::Leave( KErrNotFound ); - iBrandId->Des().Copy( *iDefaultBrandId ); + User::Leave( KErrNotFound ); } }