MCL/sf/os/bt: comparison atext/server/src/atextcommonsession.cpp

equal deleted inserted replaced

-:f8503e232b0c
+:9f17f914e828
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 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"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:
 *
 */
 #include <badesca.h>
 // ---------------------------------------------------------------------------
 //
 CATExtCommonSession::CATExtCommonSession( CATExtSrvCommon& aServer,
 const TVersion& aVersion ) :
 iServer( aServer ),
+iEComSession( NULL ),
 iVersion( aVersion )
 {
 }
 // ---------------------------------------------------------------------------
 if ( retTemp != KErrNone )
 {
 TRACE_FUNC_EXIT
 User::Leave( retTemp );
 }
-REComSession& ecomSession = REComSession::OpenL();
+iEComSession = &REComSession::OpenL();
-CleanupClosePushL( ecomSession );
 RImplInfoPtrArray implementations;
 CleanupResetDestroyClosePushL( implementations );
 TUid ifUid = TUid::Uid( ATEXT_INTERFACE_COM_UID );
-iEComSession.ListImplementationsL( ifUid,
+iEComSession->ListImplementationsL( ifUid,
 implementations );
 if ( implementations.Count() != 1 )
 {
 TRACE_FUNC_EXIT
 User::Leave( KErrGeneral );
 }
 TUid pluginUid = implementations[0]->ImplementationUid();
 iCommonBase = CATExtCommonBase::NewL( pluginUid, *this, connectionName );
 CleanupStack::PopAndDestroy( &implementations );
-CleanupStack::Pop( &ecomSession );
 CleanupStack::PopAndDestroy( &connectionName );
-iEComSession = ecomSession;
 TRACE_FUNC_EXIT
 }
 // ---------------------------------------------------------------------------
 // Synchronously closes the session
 {
 iNvramStatusMessage.Complete( KErrServerTerminated );
 }
 delete iCommonBase;
 iCommonBase = NULL;
-iEComSession.Close();
+if ( iEComSession )
+{
+iEComSession->Close();
+}
 if ( !aSyncClose )
 {
 REComSession::FinalClose();
 iServer.ClientClosed( *this );
 }

branch	RCL_3
changeset 16	9f17f914e828
parent 0	29b1cd4cb562