Imported Upstream version 1.0.0

[platform/upstream/iotivity.git] / android / android_api / base / jni / JniOnPlatformInfoListener.cpp

diff --git a/android/android_api/base/jni/JniOnPlatformInfoListener.cpp b/android/android_api/base/jni/JniOnPlatformInfoListener.cpp
index 27ecf74..03e2ed8 100644 (file)
--- 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)