telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp
branchRCL_3
changeset 74 9200f38b1324
parent 66 07a122eea281
child 82 042fd2753b8f
equal deleted inserted replaced
70:4814c5a49428 74:9200f38b1324
     1 // Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
     1 // Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
     2 // All rights reserved.
     2 // All rights reserved.
     3 // This component and the accompanying materials are made available
     3 // This component and the accompanying materials are made available
     4 // under the terms of "Eclipse Public License v1.0"
     4 // under the terms of "Eclipse Public License v1.0"
     5 // which accompanies this distribution, and is available
     5 // which accompanies this distribution, and is available
     6 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
     6 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
   153             TRAP( leaveCode, ret = DoExtFuncL( aTsyReqHandle, aIpc, 
   153             TRAP( leaveCode, ret = DoExtFuncL( aTsyReqHandle, aIpc, 
   154                 aPackage ); );
   154                 aPackage ); );
   155 
   155 
   156             if ( KErrNone != leaveCode )
   156             if ( KErrNone != leaveCode )
   157                 {
   157                 {
   158                 ReqCompleted( aTsyReqHandle, leaveCode );
   158 				//reset request handle to indicate the request is no longer ongoing
       
   159                 iMmTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle );
       
   160 				ReqCompleted( aTsyReqHandle, leaveCode );
   159                 }
   161                 }
   160 
   162             else if ( CMmSmsTsy::EMultimodeSmsReqHandleUnknown != iReqHandleType )
   161             // save request handle
       
   162             if ( CMmSmsTsy::EMultimodeSmsReqHandleUnknown != iReqHandleType )
       
   163                 {
   163                 {
       
   164                 // save request handle
   164 #ifdef REQHANDLE_TIMER
   165 #ifdef REQHANDLE_TIMER
   165                 iMmSmsTsy->SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
   166                 iMmSmsTsy->SetTypeOfResponse( iReqHandleType, aTsyReqHandle );
   166 #else
   167 #else
   167                 // Never comes here. See SetTypeOfResponse.
   168                 // Never comes here. See SetTypeOfResponse.
   168                 iMmTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, 
   169                 iMmTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, 
   169                     aTsyReqHandle );
   170                     aTsyReqHandle );
   170 #endif // REQHANDLE_TIMER
   171 #endif // REQHANDLE_TIMER   
   171                 // We've finished with this value now. Clear it so it doesn't leak
       
   172                 //  up to any other instances of this method down the call stack
       
   173                 iReqHandleType = CMmSmsTsy::EMultimodeSmsReqHandleUnknown;
       
   174                 }
   172                 }
       
   173             // We've finished with this value now. Clear it so it doesn't leak
       
   174             //  up to any other instances of this method down the call stack
       
   175             iReqHandleType = CMmSmsTsy::EMultimodeSmsReqHandleUnknown;
   175             break;
   176             break;
   176         }
   177         }
   177     
   178     
   178     return ret;
   179     return ret;
   179     }
   180     }