X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fnotification%2Fcpp-wrapper%2Fconsumer%2Fsrc%2FNSConsumerService.cpp;h=2c083e365224da991145752017aa6bc7d269fcc8;hb=b2e9024cecfff25cc830105228abea6ff4697a68;hp=deb31d9b0e44af5c060e540c160c93687811b2c2;hpb=3599faa86ef8f3e0499caa5aab7e345e147867a7;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp b/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
index deb31d9..2c083e3 100755
--- a/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
+++ b/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
@@ -49,6 +49,7 @@ namespace OIC
                 nsProvider->setTopicList(new NSTopicsList(topicLL));
                 if (state == NS_DISCOVERED)
                 {
+                    nsProvider->setProviderSubscribedState(NSProviderSubscribedState::DISCOVERED);
                     if (discoveredCallback != NULL)
                     {
                         NS_LOG(DEBUG, "initiating the Discovered callback : NS_DISCOVERED, policy false");
@@ -57,6 +58,7 @@ namespace OIC
                 }
                 else if (state == NS_ALLOW)
                 {
+                    nsProvider->setProviderSubscribedState(NSProviderSubscribedState::SUBSCRIBED);
                     if (discoveredCallback != NULL)
                     {
                         NS_LOG(DEBUG, "initiating the Discovered callback : NS_ALLOW, policy true");
@@ -73,6 +75,7 @@ namespace OIC
                 delete nsProvider;
                 if (state == NS_ALLOW)
                 {
+                    oldProvider->setProviderSubscribedState(NSProviderSubscribedState::SUBSCRIBED);
                     if (changeCallback != NULL)
                     {
                         NS_LOG(DEBUG, "initiating the callback for Response : NS_ALLOW");
@@ -81,6 +84,7 @@ namespace OIC
                 }
                 else if (state == NS_DENY)
                 {
+                    oldProvider->setProviderSubscribedState(NSProviderSubscribedState::DENY);
                     NSConsumerService::getInstance()->getAcceptedProviders().remove(oldProvider);
                     if (changeCallback != NULL)
                     {
@@ -101,10 +105,12 @@ namespace OIC
                 }
                 else if (state == NS_STOPPED)
                 {
+                    oldProvider->setProviderSubscribedState(NSProviderSubscribedState::DENY);
+                    NSConsumerService::getInstance()->getAcceptedProviders().remove(oldProvider);
                     NS_LOG(DEBUG, "initiating the State callback : NS_STOPPED");
                     if (changeCallback != NULL)
                     {
-                        NS_LOG(DEBUG, "initiating the callback for Response : NS_TOPIC");
+                        NS_LOG(DEBUG, "initiating the callback for Response : NS_STOPPED");
                         changeCallback((NSProviderState)state);
                     }
                 }
@@ -199,6 +205,11 @@ namespace OIC
         {
             NS_LOG(DEBUG, "stop - IN");
             NSStopConsumer();
+            for (auto it : getAcceptedProviders())
+            {
+                delete it;
+            }
+            getAcceptedProviders().clear();
             NS_LOG(DEBUG, "stop - OUT");
             return;
         }