Merge tizen_5.0 codes into tizen_4.0

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

diff --git a/android/android_api/base/jni/JniOnMQSubscribeListener.cpp b/android/android_api/base/jni/JniOnMQSubscribeListener.cpp
index 705f644..fdcbfb6 100644 (file)
--- a/android/android_api/base/jni/JniOnMQSubscribeListener.cpp
+++ b/android/android_api/base/jni/JniOnMQSubscribeListener.cpp
@@ -25,8 +25,8 @@
 
 JniOnMQSubscribeListener::JniOnMQSubscribeListener(JNIEnv *env,
                                                    jobject jListener,
-                                                   JniOcResource* owner)
-    : m_ownerResource(owner)
+                                                   RemoveListenerCallback removeListener)
+    : m_removeListener(removeListener)
 {
     m_jwListener = env->NewWeakGlobalRef(jListener);
 }
@@ -198,11 +198,11 @@ void JniOnMQSubscribeListener::checkExAndRemoveListener(JNIEnv* env)
     {
         jthrowable ex = env->ExceptionOccurred();
         env->ExceptionClear();
-        m_ownerResource->removeOnMQTopicSubscribeListener(env, m_jwListener);
+        m_removeListener(env, m_jwListener);
         env->Throw((jthrowable)ex);
     }
     else
     {
-        m_ownerResource->removeOnMQTopicSubscribeListener(env, m_jwListener);
+        m_removeListener(env, m_jwListener);
     }
 }