X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=android%2Fandroid_api%2Fbase%2Fjni%2FJniOnPlatformInfoListener.cpp;h=03e2ed8d3caa936061338be86a353a2190911374;hb=17c68b2fd1e74586f85e552eeab4e32dc121f8a0;hp=27ecf74ab3b688ffacc76c8a7e95d0f8d2209268;hpb=8c01dff2c5bc5496f7dc1632c498943ec6ecb015;p=platform%2Fupstream%2Fiotivity.git

diff --git a/android/android_api/base/jni/JniOnPlatformInfoListener.cpp b/android/android_api/base/jni/JniOnPlatformInfoListener.cpp
index 27ecf74..03e2ed8 100644
--- a/android/android_api/base/jni/JniOnPlatformInfoListener.cpp
+++ b/android/android_api/base/jni/JniOnPlatformInfoListener.cpp
@@ -36,8 +36,11 @@ JniOnPlatformInfoListener::~JniOnPlatformInfoListener()
     {
         jint ret;
         JNIEnv *env = GetJNIEnv(ret);
-        if (NULL == env) return;
+        if (nullptr == env) return;
+
         env->DeleteWeakGlobalRef(m_jwListener);
+        m_jwListener = nullptr;
+
         if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
     }
 }
@@ -46,7 +49,7 @@ void JniOnPlatformInfoListener::foundPlatformCallback(const OC::OCRepresentation
 {
     jint ret;
     JNIEnv *env = GetJNIEnv(ret);
-    if (NULL == env) return;
+    if (nullptr == env) return;
 
     jobject jListener = env->NewLocalRef(m_jwListener);
     if (!jListener)