From 9dae1cd32d99938b6f86e2337229d54cac26bb5e Mon Sep 17 00:00:00 2001 From: "jaesick.shin" Date: Thu, 24 Nov 2016 09:18:38 +0900 Subject: [PATCH] [IoT-1597] bug fix about retransmission When a consumer had control, they did not send a response So I modified it to respond. and remove duplicate defined about NS_QUERY_COSUMER_ID In the commit below, Committed without adding the file. https://gerrit.iotivity.org/gerrit/#/c/14657/ Change-Id: Ie38aec8895422d9edab9d46bef7c6b17499f5bce Signed-off-by: jaesick.shin Reviewed-on: https://gerrit.iotivity.org/gerrit/14709 Reviewed-by: JungYong KIM Tested-by: jenkins-iotivity Reviewed-by: Chihyun Cho Reviewed-by: Uze Choi --- service/notification/src/consumer/NSConsumerCommon.c | 2 -- service/notification/src/provider/NSProviderListener.c | 5 ----- 2 files changed, 7 deletions(-) diff --git a/service/notification/src/consumer/NSConsumerCommon.c b/service/notification/src/consumer/NSConsumerCommon.c index a790c4b..7bf8986 100644 --- a/service/notification/src/consumer/NSConsumerCommon.c +++ b/service/notification/src/consumer/NSConsumerCommon.c @@ -27,8 +27,6 @@ #include -#define NS_QUERY_CONSUMER_ID "consumerId" - pthread_mutex_t ** NSGetStackMutex() { static pthread_mutex_t * g_stackMutext = NULL; diff --git a/service/notification/src/provider/NSProviderListener.c b/service/notification/src/provider/NSProviderListener.c index dfd28e7..f8f9858 100644 --- a/service/notification/src/provider/NSProviderListener.c +++ b/service/notification/src/provider/NSProviderListener.c @@ -135,11 +135,6 @@ OCEntityHandlerResult NSEntityHandlerMessageCb(OCEntityHandlerFlag flag, NSPushQueue(SUBSCRIPTION_SCHEDULER, TASK_RECV_SUBSCRIPTION, NSCopyOCEntityHandlerRequest(entityHandlerRequest)); ehResult = OC_EH_OK; - - if (NSGetPolicy() == NS_POLICY_CONSUMER) - { - return ehResult; - } } else if(ocObAction == OC_OBSERVE_DEREGISTER) { -- 2.7.4