138 |
138 |
139 TRAP( trapError, ret = DoExtFuncL( aTsyReqHandle, aIpc, aPackage ); ); |
139 TRAP( trapError, ret = DoExtFuncL( aTsyReqHandle, aIpc, aPackage ); ); |
140 |
140 |
141 if ( KErrNone != trapError ) |
141 if ( KErrNone != trapError ) |
142 { |
142 { |
|
143 //reset request handle to indicate the request is no longer ongoing |
|
144 iTsyReqHandleStore->FindAndResetTsyReqHandle(aTsyReqHandle); |
|
145 iReqHandleType = EMultimodePacketQoSReqHandleUnknown; |
143 CMmPacketQoSTsy::ReqCompleted( aTsyReqHandle, trapError ); |
146 CMmPacketQoSTsy::ReqCompleted( aTsyReqHandle, trapError ); |
144 } |
147 } |
145 else if ( KErrNone != ret ) |
148 else if ( KErrNone != ret ) |
146 { |
149 { |
147 CMmPacketQoSTsy::ReqCompleted( aTsyReqHandle, ret ); |
150 CMmPacketQoSTsy::ReqCompleted( aTsyReqHandle, ret ); |
148 } |
151 } |
149 |
152 else if ( EMultimodePacketQoSReqHandleUnknown != iReqHandleType ) |
150 // Save request handle |
153 { |
151 if ( EMultimodePacketQoSReqHandleUnknown != iReqHandleType ) |
154 // Save request handle |
152 { |
|
153 #ifdef REQHANDLE_TIMER |
155 #ifdef REQHANDLE_TIMER |
154 SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); |
156 SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); |
155 #else |
157 #else |
156 iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); |
158 iTsyReqHandleStore->SetTsyReqHandle( iReqHandleType, aTsyReqHandle ); |
157 #endif //REQHANDLE_TIMER |
159 #endif //REQHANDLE_TIMER |
158 // We've finished with this value now. Clear it so it doesn't leak |
160 } |
159 // up to any other instances of this method down the call stack |
161 // We've finished with this value now. Clear it so it doesn't leak |
160 iReqHandleType = EMultimodePacketQoSReqHandleUnknown; |
162 // up to any other instances of this method down the call stack |
161 } |
163 iReqHandleType = EMultimodePacketQoSReqHandleUnknown; |
162 |
|
163 return KErrNone; |
164 return KErrNone; |
164 |
165 |
165 } |
166 } |
166 |
167 |
167 //---------------------------------------------------------------------------- |
168 //---------------------------------------------------------------------------- |