[DataControl] Change return error from errorCallback to synchronous way 86/151286/3
authorLukasz Bardeli <l.bardeli@samsung.com>
Mon, 2 Oct 2017 12:22:32 +0000 (14:22 +0200)
committerLukasz Bardeli <l.bardeli@samsung.com>
Mon, 2 Oct 2017 12:22:32 +0000 (14:22 +0200)
[Verification] Code compiles without error. Tested in chrome console.

Change-Id: I3be37c65bdf083e5b190314c29dc83306cf0f640
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>
src/datacontrol/datacontrol_instance.cc

index 131b2039906d114a0670f12a3f2f4f2882ac9ddd..dbfaae96bca374ddf6e47ceea1f08c8e8abb7b3d 100644 (file)
@@ -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;
   }