185 // Trap the call of DoExtFuncL |
185 // Trap the call of DoExtFuncL |
186 TRAP( trapError, ret = DoExtFuncL( aTsyReqHandle, aIpc, aPackage ) ); |
186 TRAP( trapError, ret = DoExtFuncL( aTsyReqHandle, aIpc, aPackage ) ); |
187 |
187 |
188 if ( KErrNone != trapError ) |
188 if ( KErrNone != trapError ) |
189 { |
189 { |
|
190 // Reset the request handle to indicate the request is no longer ongoing |
|
191 iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ); |
190 ReqCompleted( aTsyReqHandle, trapError ); |
192 ReqCompleted( aTsyReqHandle, trapError ); |
191 } |
193 } |
192 |
194 |
193 else if ( KErrNone != ret ) |
195 else if ( KErrNone != ret ) |
194 { |
196 { |
195 ReqCompleted( aTsyReqHandle, ret ); |
197 ReqCompleted( aTsyReqHandle, ret ); |
196 } |
198 } |
197 |
199 |
198 if ( EMultimodePacketContextReqHandleUnknown != iReqHandleType ) |
200 else if ( EMultimodePacketContextReqHandleUnknown != iReqHandleType ) |
199 { |
201 { |
200 #ifdef REQHANDLE_TIMER |
202 #ifdef REQHANDLE_TIMER |
201 SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); |
203 SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); |
202 #else |
204 #else |
203 iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); |
205 iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); |
204 #endif // REQHANDLE_TIMER |
206 #endif // REQHANDLE_TIMER |
|
207 } |
205 #ifdef ADD_REMOVE_PACKETFILTER_DEFECT_FIXED // search for this up from bottom of file |
208 #ifdef ADD_REMOVE_PACKETFILTER_DEFECT_FIXED // search for this up from bottom of file |
206 // We've finished with this value now. Clear it so it doesn't leak |
209 // We've finished with this value now. Clear it so it doesn't leak |
207 // up to any other instances of this method down the call stack |
210 // up to any other instances of this method down the call stack |
208 iReqHandleType = EMultimodePacketContextReqHandleUnknown; |
211 iReqHandleType = EMultimodePacketContextReqHandleUnknown; |
209 #endif |
212 #endif |
210 } |
|
211 |
|
212 return KErrNone; |
213 return KErrNone; |
213 } |
214 } |
214 |
215 |
215 // --------------------------------------------------------------------------- |
216 // --------------------------------------------------------------------------- |
216 // CMmPacketContextTsy::DoExtFuncL |
217 // CMmPacketContextTsy::DoExtFuncL |