331 |
331 |
332 // Check was there an error |
332 // Check was there an error |
333 if ( trapError != KErrNone ) |
333 if ( trapError != KErrNone ) |
334 { |
334 { |
335 // Complete with error if trap error |
335 // Complete with error if trap error |
|
336 // Reset request handle to indicate the request is no longer ongoing |
|
337 iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ); |
336 ReqCompleted( aTsyReqHandle, trapError ); |
338 ReqCompleted( aTsyReqHandle, trapError ); |
337 } |
339 } |
338 else if ( ret != KErrNone ) |
340 else if ( ret != KErrNone ) |
339 { |
341 { |
340 // Complete with error if return value error |
342 // Complete with error if return value error |
341 ReqCompleted( aTsyReqHandle, ret ); |
343 ReqCompleted( aTsyReqHandle, ret ); |
342 } |
344 } |
343 |
345 else if ( EMultimodeENStoreReqHandleUnknown != iReqHandleType ) |
344 // Save request handle |
346 { |
345 if ( EMultimodeENStoreReqHandleUnknown != iReqHandleType ) |
347 // Save request handle |
346 { |
|
347 #ifdef REQHANDLE_TIMER |
348 #ifdef REQHANDLE_TIMER |
348 SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); |
349 SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); |
349 #else |
350 #else |
350 iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); |
351 iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); |
351 #endif |
352 #endif |
|
353 } |
352 // We've finished with this value now. Clear it so it doesn't leak |
354 // We've finished with this value now. Clear it so it doesn't leak |
353 // up to any other instances of this method down the call stack |
355 // up to any other instances of this method down the call stack |
354 iReqHandleType = EMultimodeENStoreReqHandleUnknown; |
356 iReqHandleType = EMultimodeENStoreReqHandleUnknown; |
355 } |
357 return KErrNone; |
356 |
|
357 return KErrNone; |
|
358 } |
358 } |
359 |
359 |
360 // --------------------------------------------------------------------------- |
360 // --------------------------------------------------------------------------- |
361 // CMmENStoreTsy::DoExtFuncL |
361 // CMmENStoreTsy::DoExtFuncL |
362 // Dispatches extension function requests. |
362 // Dispatches extension function requests. |