[IOT-1363] Fix from C++ changes

patch 2 : resolved merge conflict

Change-Id: I535084c3e1c9fcf302038ccbf98aaff02cd97167
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12343
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/cpp-wrapper/common/NSMessage.cpp b/service/notification/cpp-wrapper/common/NSMessage.cpp
index b5da51b..324b0a2 100755 (executable)
--- a/service/notification/cpp-wrapper/common/NSMessage.cpp
+++ b/service/notification/cpp-wrapper/common/NSMessage.cpp
@@ -32,7 +32,7 @@ namespace OIC
             m_messageId = 0;\r
             m_type = NSMessage::NSMessageType::NS_MESSAGE_ALERT;\r
             m_ttl = 0;\r
-            m_mediaContents = new NSMediaContents();\r
+            m_mediaContents = nullptr;\r
 \r
             if (msg != nullptr)\r
             {\r
@@ -56,8 +56,11 @@ namespace OIC
                     m_sourceName.assign(msg->sourceName, strlen(msg->sourceName));\r
 \r
                 if (msg->mediaContents != nullptr)\r
+                {\r
+                    m_mediaContents = new NSMediaContents();\r
                     if ((msg->mediaContents->iconImage != nullptr) && strlen(msg->mediaContents->iconImage))\r
                         m_mediaContents->setIconImage(msg->mediaContents->iconImage);\r
+                }\r
 \r
                 if ((msg->topic != nullptr) && strlen(msg->topic))\r
                     m_topic.assign(msg->topic, strlen(msg->topic));\r

diff --git a/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp b/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp
index 29a9366..d3c13b4 100755 (executable)
--- a/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp
+++ b/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp
@@ -73,11 +73,13 @@ namespace OIC
             nsMsg->contentText = OICStrdup(msg->getContentText().c_str());\r
             nsMsg->topic = OICStrdup(msg->getTopic().c_str());\r
 \r
-            nsMsg->mediaContents = new ::NSMediaContents;\r
             if (msg->getMediaContents() != nullptr)\r
+            {\r
+                nsMsg->mediaContents = new ::NSMediaContents;\r
                 nsMsg->mediaContents->iconImage = OICStrdup(msg->getMediaContents()->getIconImage().c_str());\r
+            }\r
             else\r
-                nsMsg->mediaContents->iconImage = nullptr;\r
+                nsMsg->mediaContents = nullptr;\r
             nsMsg->extraInfo = msg->getExtraInfo().getPayload();\r
             return nsMsg;\r
         }\r