Fix Jira issues(IOT-1268)
authorParkhi <h_w.park@samsung.com>
Mon, 26 Sep 2016 02:54:47 +0000 (11:54 +0900)
committerUze Choi <uzchoi@samsung.com>
Mon, 26 Sep 2016 10:22:50 +0000 (10:22 +0000)
Change-Id: Ifaf1708cbcf2f0b3f66ecc10b8d2ee389ddb723e
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.cpp

index 6d2216d..e9cebf6 100755 (executable)
@@ -43,12 +43,18 @@ Java_org_iotivity_service_easysetup_mediator_EasySetup_nativeCreateRemoteEnrolle
     std::shared_ptr<RemoteEnrollee> nativeRemoteEnrollee;
     jobject jRemoteEnrollee;
 
+    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