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