diff -r ccb4f6b3db21 -r 8cb079868133 accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommandObserver.cpp --- a/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommandObserver.cpp Tue Aug 31 16:29:05 2010 +0300 +++ b/accessoryservices/accessoryserver/src/ASYProxy/ASYProxyCommandObserver.cpp Wed Sep 01 12:34:26 2010 +0100 @@ -181,28 +181,25 @@ { COM_TRACE_( "[AccFW:AsyProxy] CASYProxyCommandObserver::DoCancel()" ); - if ( iAsyProxyCommsSrvc ) + iAsyProxyCommsSrvc->iAsyComms.CancelNotifyProcessCommand(); + + if ( !iInDestructionPhase ) { - iAsyProxyCommsSrvc->iAsyComms.CancelNotifyProcessCommand(); + COM_TRACE_( "[AccFW:AsyProxy] Proxy Command Observation is Cancelled while Destruction is not in Progress" ); + #ifdef _DEBUG + TRAPD( errUpdate, iAsyProxyCommsSrvc->UpdateAsyCommsStackL() ); + TRAPD( errCreate, iAsyProxyCommsSrvc->CreateAsyCommandHandlerL( this ) ); + + COM_TRACE_1( "[AccFW:AsyProxy] CASYProxyCommandObserver::DoCancel - errUpdate == %d", errUpdate ); + COM_TRACE_1( "[AccFW:AsyProxy] CASYProxyCommandObserver::DoCancel - errCreate == %d", errCreate ); + #else + TRAP_IGNORE( iAsyProxyCommsSrvc->UpdateAsyCommsStackL() ); + TRAP_IGNORE( iAsyProxyCommsSrvc->CreateAsyCommandHandlerL( this ) ); + #endif + } - if ( !iInDestructionPhase ) - { - COM_TRACE_( "[AccFW:AsyProxy] Proxy Command Observation is Cancelled while Destruction is not in Progress" ); - #ifdef _DEBUG - TRAPD( errUpdate, iAsyProxyCommsSrvc->UpdateAsyCommsStackL() ); - TRAPD( errCreate, iAsyProxyCommsSrvc->CreateAsyCommandHandlerL( this ) ); - - COM_TRACE_1( "[AccFW:AsyProxy] CASYProxyCommandObserver::DoCancel - errUpdate == %d", errUpdate ); - COM_TRACE_1( "[AccFW:AsyProxy] CASYProxyCommandObserver::DoCancel - errCreate == %d", errCreate ); - #else - TRAP_IGNORE( iAsyProxyCommsSrvc->UpdateAsyCommsStackL() ); - TRAP_IGNORE( iAsyProxyCommsSrvc->CreateAsyCommandHandlerL( this ) ); - #endif - } - - iAsyProxyCommsSrvc->Destroy( KErrNotFound ); // Transaction Id is not known know - } - + iAsyProxyCommsSrvc->Destroy( KErrNotFound ); // Transaction Id is not known know + COM_TRACE_( "[AccFW:AsyProxy] CASYProxyCommandObserver::DoCancel - return void" ); }