Allow multiple calls on OCResource::observe().
authorZiran Sun <ziran.sun@samsung.com>
Tue, 13 Sep 2016 10:41:06 +0000 (11:41 +0100)
committerHabib Virji <habib.virji@samsung.com>
Tue, 20 Sep 2016 14:50:10 +0000 (14:50 +0000)
Remove check against m_observeHandle in OCResource::observe().
This will allow mutliple calls on observe with different query
parameters.

Bug: https://jira.iotivity.org/browse/IOT-1115
Change-Id: I1bae9e8db8999bf6e805eec75ebcbe9f4af8b3c7
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11735
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
resource/src/OCResource.cpp

index 9fd3d5b..ba6df4b 100644 (file)
@@ -445,11 +445,6 @@ OCStackResult OCResource::observe(ObserveType observeType,
         const QueryParamsMap& queryParametersMap, ObserveCallback observeHandler,
         QualityOfService QoS)
 {
-    if (m_observeHandle != nullptr)
-    {
-        return result_guard(OC_STACK_INVALID_PARAM);
-    }
-
     return checked_guard(m_clientWrapper.lock(), &IClientWrapper::ObserveResource,
                          observeType, &m_observeHandle, m_devAddr,
                          m_uri, queryParametersMap, m_headerOptions,