From 0f74090bec9ff412e78b0529eca922792bf316c9 Mon Sep 17 00:00:00 2001
From: Parkhi <h_w.park@samsung.com>
Date: Mon, 26 Sep 2016 11:54:47 +0900
Subject: [PATCH] Fix Jira issues(IOT-1268)

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>
---
 .../android/EasySetupCore/src/main/jni/JniEasySetup.cpp   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 6d2216db7..e9cebf647 100755
--- 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
@@ -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
-- 
2.34.1