diff options
| author | Alexander Kutsan <AKutsan@luxoft.com> | 2016-10-12 10:10:10 +0300 |
|---|---|---|
| committer | Alexander Kutsan <AKutsan@luxoft.com> | 2016-10-12 10:10:10 +0300 |
| commit | afbfe5a6b869d31e44b2ed57547d7cf3f875339f (patch) | |
| tree | bc160350e1c826947d86a7ef0eb32f9c63979e9a | |
| parent | d40b5d9aadc17a3ff08bd10d1ee8b315234b4ba3 (diff) | |
| download | sdl_core-afbfe5a6b869d31e44b2ed57547d7cf3f875339f.tar.gz | |
fixup! Add function_id check in request controller
| -rw-r--r-- | src/components/application_manager/src/request_controller.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/components/application_manager/src/request_controller.cc b/src/components/application_manager/src/request_controller.cc index 2a7a96e0de..cdf1616e42 100644 --- a/src/components/application_manager/src/request_controller.cc +++ b/src/components/application_manager/src/request_controller.cc @@ -227,7 +227,7 @@ void RequestController::removeNotification( LOG4CXX_DEBUG(logger_, "Cant find notification"); } -void RequestController::terminateRequest(const uint32_t correlation_id, +void RequestController::TerminateRequest(const uint32_t correlation_id, const uint32_t connection_key, const int32_t function_id, bool force_terminate) { @@ -240,11 +240,11 @@ void RequestController::terminateRequest(const uint32_t correlation_id, RequestInfoPtr request = waiting_for_response_.Find(connection_key, correlation_id); if (!request) { - LOG4CXX_WARN(logger_, "Request not found in waiting_for_response"); + LOG4CXX_WARN(logger_, "Request was not found in waiting_for_response"); return; } if (request->request()->function_id() != function_id) { - LOG4CXX_ERROR(logger_, "Request and response funciton_id's does not match"); + LOG4CXX_ERROR(logger_, "Request and response function_id's don't match"); return; } if (force_terminate || request->request()->AllowedToTerminate()) { @@ -259,13 +259,13 @@ void RequestController::OnMobileResponse(const uint32_t mobile_correlation_id, const uint32_t connection_key, const int32_t function_id) { LOG4CXX_AUTO_TRACE(logger_); - terminateRequest(mobile_correlation_id, connection_key, function_id); + TerminateRequest(mobile_correlation_id, connection_key, function_id); } void RequestController::OnHMIResponse(const uint32_t correlation_id, const int32_t function_id) { LOG4CXX_AUTO_TRACE(logger_); - terminateRequest(correlation_id, RequestInfo::HmiConnectoinKey, function_id); + TerminateRequest(correlation_id, RequestInfo::HmiConnectoinKey, function_id); } void RequestController::terminateWaitingForExecutionAppRequests( |