projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tizen_5.0 codes into tizen_4.0
[platform/upstream/iotivity.git]
/
android
/
android_api
/
base
/
jni
/
JniOnMQTopicFoundListener.cpp
diff --git
a/android/android_api/base/jni/JniOnMQTopicFoundListener.cpp
b/android/android_api/base/jni/JniOnMQTopicFoundListener.cpp
index
6fb1845
..
8888ee9
100644
(file)
--- a/
android/android_api/base/jni/JniOnMQTopicFoundListener.cpp
+++ b/
android/android_api/base/jni/JniOnMQTopicFoundListener.cpp
@@
-24,8
+24,8
@@
#include "JniUtils.h"
JniOnMQTopicFoundListener::JniOnMQTopicFoundListener(JNIEnv *env, jobject jListener,
#include "JniUtils.h"
JniOnMQTopicFoundListener::JniOnMQTopicFoundListener(JNIEnv *env, jobject jListener,
-
JniOcResource* ow
ner)
- : m_
ownerResource(ow
ner)
+
RemoveListenerCallback removeListe
ner)
+ : m_
removeListener(removeListe
ner)
{
m_jwListener = env->NewWeakGlobalRef(jListener);
}
{
m_jwListener = env->NewWeakGlobalRef(jListener);
}
@@
-255,11
+255,11
@@
void JniOnMQTopicFoundListener::checkExAndRemoveListener(JNIEnv* env)
{
jthrowable ex = env->ExceptionOccurred();
env->ExceptionClear();
{
jthrowable ex = env->ExceptionOccurred();
env->ExceptionClear();
- m_
ownerResource->removeOnTopicFound
Listener(env, m_jwListener);
+ m_
remove
Listener(env, m_jwListener);
env->Throw((jthrowable)ex);
}
else
{
env->Throw((jthrowable)ex);
}
else
{
- m_
ownerResource->removeOnTopicFound
Listener(env, m_jwListener);
+ m_
remove
Listener(env, m_jwListener);
}
}
}
}