From: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
Date: Mon, 15 Feb 2016 09:20:29 +0000 (+0100)
Subject: [iotcon] Representation in Request may be null.
X-Git-Tag: submit/tizen/20160222.104327^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee534097b3cc2aa78c6b1b634e5d061d4837be22;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[iotcon] Representation in Request may be null.

Change-Id: I9f7b1bccc80d3e77a40548d9eb5ffa2815161937
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
---

diff --git a/src/iotcon/iotcon_api.js b/src/iotcon/iotcon_api.js
index 288447b9..2e20b6c8 100644
--- a/src/iotcon/iotcon_api.js
+++ b/src/iotcon/iotcon_api.js
@@ -266,6 +266,8 @@ function Request(data) {
 
   if (data.representation) {
     data.representation = createRepresentation(data.representation);
+  } else {
+    data.representation = null;
   }
 
   if (data.options) {
diff --git a/src/iotcon/iotcon_utils.cc b/src/iotcon/iotcon_utils.cc
index 6f2a99f9..762f2cb3 100644
--- a/src/iotcon/iotcon_utils.cc
+++ b/src/iotcon/iotcon_utils.cc
@@ -443,12 +443,16 @@ common::TizenResult IotconUtils::RequestToJson(iotcon_request_h request,
     if (!result) {
       LogAndReturnTizenError(result, ("iotcon_request_get_representation() failed"));
     }
-    picojson::value v{picojson::object{}};
-    result = RepresentationToJson(representation, &v.get<picojson::object>());
-    if (!result) {
-      LogAndReturnTizenError(result, ("RepresentationToJson() failed"));
+    if (representation) {
+      picojson::value v{picojson::object{}};
+      result = RepresentationToJson(representation, &v.get<picojson::object>());
+      if (!result) {
+        LogAndReturnTizenError(result, ("RepresentationToJson() failed"));
+      }
+      out->insert(std::make_pair(kRepresentation, v));
+    } else {
+      LoggerD("Request doesn't have representation.");
     }
-    out->insert(std::make_pair(kRepresentation, v));
   }
 
   {