fix issues relates to wrong syncInfo received

[platform/upstream/iotivity.git] / service / notification / android / notification-service / src / main / jni / consumer / JniNotificationConsumer.cpp

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 78352ef..ce49ec3 100755 (executable)
--- a/service/notification/android/notification-service/src/main/jni/consumer/JniNotificationConsumer.cpp
+++ b/service/notification/android/notification-service/src/main/jni/consumer/JniNotificationConsumer.cpp
@@ -116,38 +116,32 @@ jobject getJavaSyncType(JNIEnv *env, OIC::Service::NSSyncInfo::NSSyncType nsType
         LOGE ("Failed to Get ObjectClass for SyncType");\r
         return NULL;\r
     }\r
-    jobject syncType;\r
     switch (nsType)\r
     {\r
         case OIC::Service::NSSyncInfo::NSSyncType::NS_SYNC_UNREAD:\r
             {\r
                 static jfieldID fieldID = env->GetStaticFieldID(cls_SyncType,\r
                                           "UNREAD", "Lorg/iotivity/service/ns/common/SyncInfo$SyncType;");\r
-                syncType = env->GetStaticObjectField(cls_SyncType, fieldID);\r
+                return env->GetStaticObjectField(cls_SyncType, fieldID);\r
             }\r
         case OIC::Service::NSSyncInfo::NSSyncType::NS_SYNC_READ :\r
             {\r
                 static jfieldID fieldID = env->GetStaticFieldID(cls_SyncType,\r
                                           "READ", "Lorg/iotivity/service/ns/common/SyncInfo$SyncType;");\r
-                syncType = env->GetStaticObjectField(cls_SyncType, fieldID);\r
+                return env->GetStaticObjectField(cls_SyncType, fieldID);\r
             }\r
         case OIC::Service::NSSyncInfo::NSSyncType::NS_SYNC_DELETED :\r
             {\r
                 static jfieldID fieldID = env->GetStaticFieldID(cls_SyncType,\r
                                           "DELETED", "Lorg/iotivity/service/ns/common/SyncInfo$SyncType;");\r
-                syncType = env->GetStaticObjectField(cls_SyncType, fieldID);\r
+                return env->GetStaticObjectField(cls_SyncType, fieldID);\r
             }\r
-\r
-    }\r
-\r
-    if (syncType == NULL)\r
-    {\r
-        LOGD("Error: object of field  Synctype  is null");\r
+        default:\r
+            return NULL;\r
     }\r
 \r
-    env->DeleteLocalRef(cls_SyncType);\r
     LOGD ("ConsumerService_getJavaSyncType - OUT");\r
-    return syncType;\r
+    return NULL;\r
 }\r
 \r
 jobject getJavaTopicState(JNIEnv *env, OIC::Service::NSTopic::NSTopicState nsState)\r
@@ -610,7 +604,7 @@ jobject getJavaMessage(JNIEnv *env, OIC::Service::NSMessage *message)
         }\r
         env->SetObjectField(obj_message, fid_type, jType);\r
     }\r
-    \r
+\r
     LOGD("Reading OCRepresentation Object from Native");\r
 \r
     OC::OCRepresentation *ocRepresentation = new OC::OCRepresentation(message->getExtraInfo());\r
@@ -636,7 +630,7 @@ jobject getJavaMessage(JNIEnv *env, OIC::Service::NSMessage *message)
     }\r
     LOGD ("setting extraInfo field");\r
     env->SetObjectField(obj_message, fid_extraInfo, jRepresentation);\r
-    \r
+\r
     env->DeleteLocalRef(cls_message);\r
     LOGD ("ConsumerService_getJavaMessage - OUT");\r
     return obj_message;\r