Commit 846b8723 authored by Jihun Ha's avatar Jihun Ha Committed by Uze Choi

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: default avatarJihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16245Tested-by: default avatarjenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: default avatarUze Choi <uzchoi@samsung.com>
parent a75c665b
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment