diff -r 4814c5a49428 -r 9200f38b1324 telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp Tue Sep 14 23:33:57 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp Wed Sep 15 13:30:43 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -1984,14 +1984,15 @@ if ( KErrNone != trapError ) { + //reset request handle to indicate the request is no longer ongoing + iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle); CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, trapError ); } else if ( KErrNone != ret ) { CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, ret ); } - - if ( EMultimodePacketServiceReqHandleUnknown != iReqHandleType ) + else if ( EMultimodePacketServiceReqHandleUnknown != iReqHandleType ) { // Save request handle type @@ -2000,11 +2001,10 @@ #else iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, iTsyReqHandle ); #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 = EMultimodePacketServiceReqHandleUnknown; } - + // 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 = EMultimodePacketServiceReqHandleUnknown; return KErrNone; } @@ -4107,5 +4107,16 @@ return iMaxActiveServices; } + +//----------------------------------------------------------------------------- +// TBool CMmPacketServiceTsy::ResetReqHandle +// Resets request handle in the req handle store +//----------------------------------------------------------------------------- +// +TBool CMmPacketServiceTsy::ResetReqHandle( const TTsyReqHandle aTsyReqHandle ) + { + return (iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ) > 0); + } + // End of File