From 5e4079c850b79fa2e39301df561c2ec1063d0308 Mon Sep 17 00:00:00 2001 From: "abitha.s" Date: Tue, 27 Sep 2016 19:02:01 +0530 Subject: [PATCH] [IOT-1363] Fix from C++ changes patch 2 : resolved merge conflict Change-Id: I535084c3e1c9fcf302038ccbf98aaff02cd97167 Signed-off-by: abitha.s Reviewed-on: https://gerrit.iotivity.org/gerrit/12343 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi Tested-by: Uze Choi --- service/notification/cpp-wrapper/common/NSMessage.cpp | 5 ++++- .../cpp-wrapper/provider/src/NSProviderService.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/service/notification/cpp-wrapper/common/NSMessage.cpp b/service/notification/cpp-wrapper/common/NSMessage.cpp index b5da51b4e..324b0a2ab 100755 --- 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; m_type = NSMessage::NSMessageType::NS_MESSAGE_ALERT; m_ttl = 0; - m_mediaContents = new NSMediaContents(); + m_mediaContents = nullptr; if (msg != nullptr) { @@ -56,8 +56,11 @@ namespace OIC m_sourceName.assign(msg->sourceName, strlen(msg->sourceName)); if (msg->mediaContents != nullptr) + { + m_mediaContents = new NSMediaContents(); if ((msg->mediaContents->iconImage != nullptr) && strlen(msg->mediaContents->iconImage)) m_mediaContents->setIconImage(msg->mediaContents->iconImage); + } if ((msg->topic != nullptr) && strlen(msg->topic)) m_topic.assign(msg->topic, strlen(msg->topic)); diff --git a/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp b/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp index 29a936692..d3c13b463 100755 --- 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()); nsMsg->topic = OICStrdup(msg->getTopic().c_str()); - nsMsg->mediaContents = new ::NSMediaContents; if (msg->getMediaContents() != nullptr) + { + nsMsg->mediaContents = new ::NSMediaContents; nsMsg->mediaContents->iconImage = OICStrdup(msg->getMediaContents()->getIconImage().c_str()); + } else - nsMsg->mediaContents->iconImage = nullptr; + nsMsg->mediaContents = nullptr; nsMsg->extraInfo = msg->getExtraInfo().getPayload(); return nsMsg; } -- 2.34.1