From 3e85e305dc55bc37e3e1211a2dd3495017b4ed27 Mon Sep 17 00:00:00 2001 From: Lukasz Bardeli Date: Mon, 2 Oct 2017 14:22:32 +0200 Subject: [PATCH] [DataControl] Change return error from errorCallback to synchronous way [Verification] Code compiles without error. Tested in chrome console. Change-Id: I3be37c65bdf083e5b190314c29dc83306cf0f640 Signed-off-by: Lukasz Bardeli --- src/datacontrol/datacontrol_instance.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/datacontrol/datacontrol_instance.cc b/src/datacontrol/datacontrol_instance.cc index 131b2039..dbfaae96 100644 --- a/src/datacontrol/datacontrol_instance.cc +++ b/src/datacontrol/datacontrol_instance.cc @@ -1108,9 +1108,8 @@ void DatacontrolInstance::AddChangeListener(const picojson::value& args, picojso user_data->event_type = type; if (DATA_CONTROL_ERROR_NONE != result) { - // According to native documentation only IOError can be returned to webapi, other errors are - // handled earlier - result_callback(handle, DATA_CONTROL_ERROR_IO_ERROR, 0, user_data.get()); + LogAndReportError(ServiceNotAvailableException("AddChangeListener failed"), out, + ("AddChangeListener failed: %d (%s)", result, get_error_message(result))); return; } @@ -1119,9 +1118,8 @@ void DatacontrolInstance::AddChangeListener(const picojson::value& args, picojso user_data.get(), &watch_id); if (DATA_CONTROL_ERROR_NONE != result) { - // According to native documentation only IOError can be returned to webapi, other errors are - // handled earlier - result_callback(handle, DATA_CONTROL_ERROR_IO_ERROR, 0, user_data.get()); + LogAndReportError(ServiceNotAvailableException("AddChangeListener failed"), out, + ("AddChangeListener failed: %d (%s)", result, get_error_message(result))); return; } -- 2.34.1