FCL/sf/os/bt: comparison atext/server/src/atextsession.cpp

equal deleted inserted replaced

-:5e5528a288fe
+:b69e63ed1902
 // CATExtSession::CATExtSession
 // ---------------------------------------------------------------------------
 //
 CATExtSession::CATExtSession( CATExtSrv& aServer, const TVersion& aVersion ) :
 iServer( aServer ),
+iEComSession( NULL ),
 iListener( NULL ),
 iMetadata( NULL ),
 iVersion( aVersion )
 {
 }
 if ( iMetadata || iListener )
 {
 TRACE_FUNC_EXIT
 User::Leave( KErrGeneral );
 }
-REComSession& ecomSession = REComSession::OpenL();
+iEComSession = &REComSession::OpenL();
-CleanupClosePushL( ecomSession );
 TPckgBuf<TUid> ifUidPckgBuf;
 TInt retTemp = ReadStructFromMessage( ifUidPckgBuf,
 EATExtConnectParamUid,
 aMessage );
 if ( retTemp != KErrNone )
 {
 TRACE_FUNC_EXIT
 User::Leave( retTemp );
 }
 // Create listener
-CATExtListen* listener = CATExtListen::NewLC( ecomSession, this );
+CATExtListen* listener = CATExtListen::NewLC( *iEComSession, this );
 listener->AddInterfaceUid( ifUidPckgBuf() );
 // Create metadata. Pass iListener to add the UIDs
-CATExtMetadata* metadata = CATExtMetadata::NewLC( ecomSession,
+CATExtMetadata* metadata = CATExtMetadata::NewLC( *iEComSession,
 listener,
 *this );
 metadata->CreateImplementationMetadataL( ifUidPckgBuf(), connectionName );
 listener->IssueRequest();
 CleanupStack::Pop( metadata );
 CleanupStack::Pop( listener );
 CleanupStack::PopAndDestroy( &connectionName );
-CleanupStack::Pop( &ecomSession );
-iEComSession = ecomSession;
 iListener = listener;
 iMetadata = metadata;
 TRACE_FUNC_EXIT
 }
 }
 delete iListener;
 iListener = NULL;
 delete iMetadata;
 iMetadata = NULL;
-iEComSession.Close();
+if ( iEComSession )
+{
+iEComSession->Close();
+}
 if ( !aSyncClose )
 {
 REComSession::FinalClose();
 iServer.ClientClosed( *this );
 }

changeset 24	b69e63ed1902
parent 21	5e5528a288fe