[IOT-2113] Change the logic not to delete double time

Change-Id: I56923e53e9b81da45b9ff9e50e7df9cdde233c25
Signed-off-by: ol.beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19631
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

diff --git a/service/notification/android/notification-service/src/main/jni/consumer/JniNotificationConsumer.cpp b/service/notification/android/notification-service/src/main/jni/consumer/JniNotificationConsumer.cpp
index 5ec78e934777028d57920b9925bd6510e55cf0eb..0d16c3db4c904e988d2795f2cb7dac742295c1be 100644 (file)
--- a/service/notification/android/notification-service/src/main/jni/consumer/JniNotificationConsumer.cpp
+++ b/service/notification/android/notification-service/src/main/jni/consumer/JniNotificationConsumer.cpp
@@ -624,7 +624,6 @@ jobject getJavaMessage(JNIEnv *env, OIC::Service::NSMessage message)
     {\r
         NS_LOGE ("Failed to create OcRepresentation");\r
         delete ocRepresentation;\r
-        return NULL;\r
     }\r
     else\r
     {\r
@@ -635,7 +634,10 @@ jobject getJavaMessage(JNIEnv *env, OIC::Service::NSMessage message)
     if (!fid_extraInfo)\r
     {\r
         NS_LOGE ("Failed to get mExtraInfo for Message");\r
-        delete ocRepresentation;\r
+        if (ocRepresentation)\r
+        {\r
+            delete ocRepresentation;\r
+        }\r
         return NULL;\r
     }\r
     NS_LOGD ("setting extraInfo field");\r