From 66b4b024a7d317913c377949d94a298a4a224c42 Mon Sep 17 00:00:00 2001 From: Ziran Sun Date: Tue, 13 Sep 2016 11:41:06 +0100 Subject: [PATCH] Allow multiple calls on OCResource::observe(). 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 Reviewed-on: https://gerrit.iotivity.org/gerrit/11735 Tested-by: jenkins-iotivity Reviewed-by: Todd Malsbary Reviewed-by: Habib Virji --- resource/src/OCResource.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resource/src/OCResource.cpp b/resource/src/OCResource.cpp index 9fd3d5b..ba6df4b 100644 --- a/resource/src/OCResource.cpp +++ b/resource/src/OCResource.cpp @@ -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, -- 2.7.4