Fixed bug of sending empty child attribute at Scene List Resource response.
authorjyong2.kim <jyong2.kim@samsung.com>
Fri, 26 Feb 2016 06:44:58 +0000 (15:44 +0900)
committerUze Choi <uzchoi@samsung.com>
Sat, 27 Feb 2016 05:11:20 +0000 (05:11 +0000)
If Scene resource has not children, these attribute's value is empty.
But CBOR parser can not parsing empty attribute.
This patch, attribute remove when the attribute's value is empty.

Change-Id: Iaa0be2cf0df19211b2b2598ec47da94286068e4c
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5215
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
service/scene-manager/src/SceneListResource.cpp

index 2c56d1f..d69ee23 100644 (file)
@@ -105,7 +105,10 @@ namespace OIC
                                     membersAttrs.push_back(pMember->getRCSResourceObject()->getAttributes());
                                 });
 
-                        collectionAttr[SCENE_KEY_CHILD] = membersAttrs;
+                        if (membersAttrs.size())
+                        {
+                            collectionAttr[SCENE_KEY_CHILD] = membersAttrs;
+                        }
 
                         childrenAttrs.push_back(collectionAttr);
                     });