Android: Allows to destroy OcResource java object before all of the C++ callbacks...

Change-Id: Idc77b12f7ad6aa3dd8d4cea6e4555eac3f776ab7
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2306
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

diff --git a/android/android_api/base/jni/JniOcResource.cpp b/android/android_api/base/jni/JniOcResource.cpp
index 13a8451..d361c81 100644 (file)
--- a/android/android_api/base/jni/JniOcResource.cpp
+++ b/android/android_api/base/jni/JniOcResource.cpp
@@ -31,6 +31,8 @@ JniOcResource::JniOcResource(std::shared_ptr<OCResource> resource)
 JniOcResource::~JniOcResource()
 {
     LOGD("~JniOcResource()");
+
+    m_sharedResource->cancelObserve();
     m_sharedResource = NULL;
 
     jint envRet;

diff --git a/android/android_api/base/jni/JniOnDeleteListener.cpp b/android/android_api/base/jni/JniOnDeleteListener.cpp
index ce2b3f8..2a0945a 100644 (file)
--- a/android/android_api/base/jni/JniOnDeleteListener.cpp
+++ b/android/android_api/base/jni/JniOnDeleteListener.cpp
@@ -37,7 +37,10 @@ JniOnDeleteListener::~JniOnDeleteListener()
         jint ret;
         JNIEnv *env = GetJNIEnv(ret);
         if (NULL == env) return;
+
         env->DeleteWeakGlobalRef(m_jwListener);
+        m_jwListener = nullptr;
+
         if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
     }
 }

diff --git a/android/android_api/base/jni/JniOnGetListener.cpp b/android/android_api/base/jni/JniOnGetListener.cpp
index e2e4484..320fb43 100644 (file)
--- a/android/android_api/base/jni/JniOnGetListener.cpp
+++ b/android/android_api/base/jni/JniOnGetListener.cpp
@@ -39,6 +39,7 @@ JniOnGetListener::~JniOnGetListener()
         if (NULL == env) return;
 
         env->DeleteWeakGlobalRef(m_jwListener);
+        m_jwListener = nullptr;
 
         if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
     }

diff --git a/android/android_api/base/jni/JniOnObserveListener.cpp b/android/android_api/base/jni/JniOnObserveListener.cpp
index 934755f..869ab89 100644 (file)
--- a/android/android_api/base/jni/JniOnObserveListener.cpp
+++ b/android/android_api/base/jni/JniOnObserveListener.cpp
@@ -39,6 +39,7 @@ JniOnObserveListener::~JniOnObserveListener()
         if (NULL == env) return;
 
         env->DeleteWeakGlobalRef(m_jwListener);
+        m_jwListener = nullptr;
 
         if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
     }

diff --git a/android/android_api/base/jni/JniOnPostListener.cpp b/android/android_api/base/jni/JniOnPostListener.cpp
index 549120b..a6778bc 100644 (file)
--- a/android/android_api/base/jni/JniOnPostListener.cpp
+++ b/android/android_api/base/jni/JniOnPostListener.cpp
@@ -39,6 +39,7 @@ JniOnPostListener::~JniOnPostListener()
         if (NULL == env) return;
 
         env->DeleteWeakGlobalRef(m_jwListener);
+        m_jwListener = nullptr;
 
         if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
     }

diff --git a/android/android_api/base/jni/JniOnPutListener.cpp b/android/android_api/base/jni/JniOnPutListener.cpp
index 651db29..d1c6529 100644 (file)
--- a/android/android_api/base/jni/JniOnPutListener.cpp
+++ b/android/android_api/base/jni/JniOnPutListener.cpp
@@ -39,6 +39,7 @@ JniOnPutListener::~JniOnPutListener()
         if (NULL == env) return;
 
         env->DeleteWeakGlobalRef(m_jwListener);
+        m_jwListener = nullptr;
 
         if (JNI_EDETACHED == ret) g_jvm->DetachCurrentThread();
     }