[mediacontroller] Fix error handling in ReplyCommand. 40/203640/3
authorMichal Michalski <m.michalski2@partner.samsung.com>
Tue, 16 Apr 2019 10:26:16 +0000 (12:26 +0200)
committerMichal Michalski <m.michalski2@partner.samsung.com>
Thu, 25 Apr 2019 08:44:53 +0000 (10:44 +0200)
MediaControllerServerReplyCommand function did not
handle errors returned by MediaControllerServer::CommandReply()
call. This commit handles those errors.

[Verification]
Code compiles.

Change-Id: Ibc5acacc32ff23a6d8fa7cac096ade0e40e2b697
Signed-off-by: Michal Michalski <m.michalski2@partner.samsung.com>
src/mediacontroller/mediacontroller_instance.cc

index 1dd1fb5b5683d1d72ff458594301cde4dc6d3455..1e3bb8a6f309f618f38356f6089fe8b5c6b3f48d 100644 (file)
@@ -394,8 +394,15 @@ void MediaControllerInstance::MediaControllerServerReplyCommand(const picojson::
   CHECK_EXIST(args, "requestId", out)
   CHECK_EXIST(args, "data", out)
 
-  server_->CommandReply(args.get("clientName").get<std::string>(),
-                        args.get("requestId").get<std::string>(), args.get("data"));
+  auto result = server_->CommandReply(
+    args.get("clientName").get<std::string>(),
+    args.get("requestId").get<std::string>(),
+    args.get("data"));
+
+  if (!result) {
+    LogAndReportError(result, &out);
+    return;
+  }
 
   ReportSuccess(out);
 }