diff -r 9200f38b1324 -r 042fd2753b8f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp Wed Sep 15 13:30:43 2010 +0300 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp Wed Oct 13 15:51:46 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-2009 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" @@ -191,10 +191,7 @@ if ( trapError != KErrNone ) { //error handling. Object cannot be created. - //reset request handle to indicate the request is no longer ongoing - iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle); - iReqHandleType = EMultimodeConferenceCallReqHandleUnknown; - ReqCompleted( aTsyReqHandle, trapError ); + ReqCompleted( 0, trapError ); } //if return value is not KErrNone else if ( ret != KErrNone ) @@ -202,20 +199,20 @@ //Complete request with this error value ReqCompleted( aTsyReqHandle, ret ); } - else if ( EMultimodeConferenceCallReqHandleUnknown != iReqHandleType ) + + //save request handle + if ( EMultimodeConferenceCallReqHandleUnknown != iReqHandleType ) { - //save request handle #ifdef REQHANDLE_TIMER SetTypeOfResponse ( iReqHandleType, aTsyReqHandle ); #else iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); #endif + // 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 = EMultimodeConferenceCallReqHandleUnknown; } - - // 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 = EMultimodeConferenceCallReqHandleUnknown; - + return KErrNone; }