replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / service / easy-setup / mediator / richsdk / android / EasySetupCore / src / main / jni / JniEasySetup.cpp

diff --git a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.cpp b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.cpp
index cae9ec5..4332919 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.cpp
+++ b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.cpp
@@ -40,20 +40,32 @@ Java_org_iotivity_service_easysetup_mediator_EasySetup_nativeCreateRemoteEnrolle
 {
     ES_LOGI("JniEasySetup::nativeCreateRemoteEnrollee enter");
 
-    std::shared_ptr<RemoteEnrollee> nativeRemoteEnrollee;
-    jobject jRemoteEnrollee;
+    std::shared_ptr<RemoteEnrollee> nativeRemoteEnrollee = NULL;
+    jobject jRemoteEnrollee = NULL;
+
+    if(!jResource)
+    {
+        ES_LOGE("JniEasySetup::nativeCreateRemoteEnrollee Invalid param.");
+        return NULL;
+    }
 
     JniOcResource* jniOcResource = JniOcResource::getJniOcResourcePtr(env, jResource);
 
     if (!jniOcResource)
     {
         ES_LOGE("JniEasySetup::nativeCreateRemoteEnrollee getJniOcResourcePtr returns nullptr.");
-        return nullptr;
+        return NULL;
     }
 
     try
     {
         nativeRemoteEnrollee = EasySetup::getInstance()->createRemoteEnrollee(jniOcResource->getOCResource());
+        if (!nativeRemoteEnrollee)
+        {
+            ES_LOGE("Failed to create RemoteEnrollee object.");
+            return NULL;
+        }
+
         //create the java object
         jRemoteEnrollee = env->NewObject(g_cls_RemoteEnrollee, g_mid_RemoteEnrollee_ctor);
         if (!jRemoteEnrollee)