Imported Upstream version 1.0.1

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

diff --git a/android/android_api/base/jni/JniOnObserveListener.cpp b/android/android_api/base/jni/JniOnObserveListener.cpp
index 0b2c28f..3ad1d11 100644 (file)
--- a/android/android_api/base/jni/JniOnObserveListener.cpp
+++ b/android/android_api/base/jni/JniOnObserveListener.cpp
@@ -127,6 +127,11 @@ void JniOnObserveListener::onObserveCallback(const HeaderOptions headerOptions,
             m_ownerResource->removeOnObserveListener(env, m_jwListener);
             env->Throw((jthrowable)ex);
         }
+
+        if (OC_OBSERVE_DEREGISTER == sequenceNumber)
+        {
+            checkExAndRemoveListener(env);
+        }
     }
 
     if (JNI_EDETACHED == envRet) g_jvm->DetachCurrentThread();