1151 |
1151 |
1152 TRAP( trapError, ret = DoExtFuncL( aTsyReqHandle, aIpc, aPackage ); ); |
1152 TRAP( trapError, ret = DoExtFuncL( aTsyReqHandle, aIpc, aPackage ); ); |
1153 |
1153 |
1154 if ( trapError != KErrNone ) |
1154 if ( trapError != KErrNone ) |
1155 { |
1155 { |
|
1156 //reset request handle to indicate the request is no longer ongoing |
|
1157 iTsyReqHandleStore->FindAndResetTsyReqHandle( aTsyReqHandle ); |
1156 ReqCompleted( aTsyReqHandle, trapError ); |
1158 ReqCompleted( aTsyReqHandle, trapError ); |
1157 } |
1159 } |
1158 else if ( ret != KErrNone ) |
1160 else if ( ret != KErrNone ) |
1159 { |
1161 { |
1160 ReqCompleted( aTsyReqHandle, ret ); |
1162 ReqCompleted( aTsyReqHandle, ret ); |
1161 } |
1163 } |
1162 |
1164 else if ( EMultimodePhoneReqHandleUnknown != iReqHandleType ) |
1163 if ( EMultimodePhoneReqHandleUnknown != iReqHandleType ) |
|
1164 { |
1165 { |
1165 #ifdef REQHANDLE_TIMER |
1166 #ifdef REQHANDLE_TIMER |
1166 SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); |
1167 SetTypeOfResponse( iReqHandleType, aTsyReqHandle ); |
1167 #else |
1168 #else |
1168 iTsyReqHandleStore->SetTsyReqHandle( |
1169 iTsyReqHandleStore->SetTsyReqHandle( |
1169 iReqHandleType, aTsyReqHandle ); |
1170 iReqHandleType, aTsyReqHandle ); |
1170 #endif //REQHANDLE_TIMER |
1171 #endif //REQHANDLE_TIMER |
1171 // We've finished with this value now. Clear it so it doesn't leak |
1172 } |
1172 // up to any other instances of this method down the call stack |
1173 // We've finished with this value now. Clear it so it doesn't leak |
1173 iReqHandleType = EMultimodePhoneReqHandleUnknown; |
1174 // up to any other instances of this method down the call stack |
1174 } |
1175 iReqHandleType = EMultimodePhoneReqHandleUnknown; |
1175 } |
1176 } |
1176 |
1177 |
1177 return KErrNone; |
1178 return KErrNone; |
1178 |
1179 |
1179 } |
1180 } |