diff -r 9200f38b1324 -r 042fd2753b8f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp Wed Sep 15 13:30:43 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp Wed Oct 13 15:51:46 2010 +0300 @@ -1153,15 +1153,14 @@ if ( trapError != KErrNone ) { - //reset request handle to indicate the request is no longer ongoing - iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ); ReqCompleted( aTsyReqHandle, trapError ); } else if ( ret != KErrNone ) { ReqCompleted( aTsyReqHandle, ret ); } - else if ( EMultimodePhoneReqHandleUnknown != iReqHandleType ) + + if ( EMultimodePhoneReqHandleUnknown != iReqHandleType ) { #ifdef REQHANDLE_TIMER SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); @@ -1169,10 +1168,10 @@ iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); #endif //REQHANDLE_TIMER + // We've finished with this value now. Clear it so it doesn't leak + // up to any other instances of this method down the call stack + iReqHandleType = EMultimodePhoneReqHandleUnknown; } - // We've finished with this value now. Clear it so it doesn't leak - // up to any other instances of this method down the call stack - iReqHandleType = EMultimodePhoneReqHandleUnknown; } return KErrNone;