[IOT-2175] Fix regression with optional 'pri' property.
authorTodd Malsbary <todd.malsbary@intel.com>
Mon, 22 May 2017 16:01:10 +0000 (09:01 -0700)
committerUze Choi <uzchoi@samsung.com>
Mon, 22 May 2017 23:26:31 +0000 (23:26 +0000)
The checks added in commit 6758c572ecfa068d953bd3d5ed9614885dae01b1
made 'pri' mandatory again.

Bug: https://jira.iotivity.org/browse/IOT-2175
Change-Id: Idb6137f45bf06910a9789f23c87486df2289abca
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20261
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
resource/csdk/stack/src/ocpayloadparse.c

index 2e8f728ffb921651178717274d3cafd3283391c7..e7a04cd198d4e135e1a113f8e860e04f3a888d61 100755 (executable)
@@ -514,11 +514,9 @@ static CborError ParseResources(OCDiscoveryPayload **outPayload, CborValue *reso
 
                 if (OC_STACK_OK == parseResult)
                 {
-                    // pri
+                    // pri - optional
                     err = cbor_value_map_find_value(&epMap, OC_RSRVD_PRIORITY, &curVal);
                     VERIFY_CBOR_SUCCESS(TAG, err, "to find priority tag");
-                    err = cbor_value_is_valid(&curVal) ? CborNoError : CborUnknownError;
-                    VERIFY_CBOR_SUCCESS(TAG, err, "to find priority tag");
                     if (cbor_value_is_valid(&curVal))
                     {
                         err = cbor_value_get_int(&curVal, &pri);