[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 <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14709
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 9dae1cd32d99938b6f86e2337229d54cac26bb5e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15129

diff --git a/service/notification/src/consumer/NSConsumerCommon.c b/service/notification/src/consumer/NSConsumerCommon.c
index a790c4b..7bf8986 100644 (file)
--- a/service/notification/src/consumer/NSConsumerCommon.c
+++ b/service/notification/src/consumer/NSConsumerCommon.c
@@ -27,8 +27,6 @@
 
 #include <pthread.h>
 
-#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 1f3723f..10125f5 100644 (file)
--- 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,\r
                     NSCopyOCEntityHandlerRequest(entityHandlerRequest));\r
             ehResult = OC_EH_OK;\r
-\r
-            if (NSGetPolicy() == NS_POLICY_CONSUMER)\r
-            {\r
-                return ehResult;\r
-            }\r
         }\r
         else if (ocObAction == OC_OBSERVE_DEREGISTER)\r
         {\r