From: Jihun Ha <jihun.ha@samsung.com>
Date: Mon, 9 Jan 2017 07:00:01 +0000 (+0900)
Subject: Fix a logic to handle collection resource payload construction for
X-Git-Tag: 1.3.0~899
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=846b8723f15dbba05e6745c4f897cd81574c5277;p=platform%2Fupstream%2Fiotivity.git

Fix a logic to handle collection resource payload construction for
vendor-specific properties in easy setup.

For vendor-specific properties in provisioning resource,
they should be included in 'rep' property.

Change-Id: I6644cab3aab43b29ebf5ce48d639a4a8ca9b8016
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16245
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
---

diff --git a/service/easy-setup/enrollee/src/resourcehandler.c b/service/easy-setup/enrollee/src/resourcehandler.c
index 82ac761..44b5c04 100755
--- a/service/easy-setup/enrollee/src/resourcehandler.c
+++ b/service/easy-setup/enrollee/src/resourcehandler.c
@@ -942,6 +942,11 @@ OCRepPayload* constructResponseOfProv(OCEntityHandlerRequest *ehRequest)
             OCRepPayloadSetPropInt(payload, OC_RSRVD_ES_PROVSTATUS, g_ESProvResource.status);
             OCRepPayloadSetPropInt(payload, OC_RSRVD_ES_LAST_ERRORCODE, g_ESProvResource.lastErrCode);
 
+            if(gWriteUserdataCb)
+            {
+                gWriteUserdataCb(payload, OC_RSRVD_ES_RES_TYPE_PROV);
+            }
+
             OCRepPayloadSetPropObjectArray(payload, OC_RSRVD_ES_LINKS, arrayPayload, dimensions);
         }
         else    // link list interface
@@ -994,12 +999,12 @@ OCRepPayload* constructResponseOfProv(OCEntityHandlerRequest *ehRequest)
         OCRepPayloadSetPropInt(repPayload, OC_RSRVD_ES_PROVSTATUS, g_ESProvResource.status);
         OCRepPayloadSetPropInt(repPayload, OC_RSRVD_ES_LAST_ERRORCODE, g_ESProvResource.lastErrCode);
 
-        OCRepPayloadSetPropObject(payload, OC_RSRVD_REPRESENTATION, repPayload);
-    }
+        if(gWriteUserdataCb)
+        {
+            gWriteUserdataCb(repPayload, OC_RSRVD_ES_RES_TYPE_PROV);
+        }
 
-    if(gWriteUserdataCb)
-    {
-        gWriteUserdataCb(payload, OC_RSRVD_ES_RES_TYPE_PROV);
+        OCRepPayloadSetPropObject(payload, OC_RSRVD_REPRESENTATION, repPayload);
     }
 
     if(ehRequest->query)