pEp.foundation
/
pEpJNIAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix SignalHandshakeSignal ClassNotFound on notifyHanshake

JNI-44
Hussein Kasem 9 years ago
parent
2083f1ada8
commit
5edadd8c7f
1 changed files with 8 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/org_pEp_jniadapter_AbstractEngine.cc

13
src/org_pEp_jniadapter_AbstractEngine.cc
View File

@ -203,6 +203,7 @@ extern "C" {
static jmethodID messageToSendMethodID = NULL; static jmethodID messageToSendMethodID = NULL;
static jclass messageClass = NULL; static jclass messageClass = NULL;
static jclass identityClass = NULL; static jclass identityClass = NULL;
static jclass signalClass = NULL;
static jmethodID messageConstructorMethodID = NULL; static jmethodID messageConstructorMethodID = NULL;
// Called by sync thread only // Called by sync thread only
@ -216,15 +217,14 @@ extern "C" {
jobject signal_ = NULL; jobject signal_ = NULL;
{ {
jclass clazz_signal = findClass(sync_env, "org/pEp/jniadapter/SyncHandshakeSignal"); assert(signalClass);
assert(clazz_signal); jmethodID method_values = sync_env->GetStaticMethodID(signalClass, "values",
jmethodID method_values = sync_env->GetStaticMethodID(clazz_signal, "values",
"()[Lorg/pEp/jniadapter/SyncHandshakeSignal;"); "()[Lorg/pEp/jniadapter/SyncHandshakeSignal;");
assert(method_values); assert(method_values);
jfieldID field_value = sync_env->GetFieldID(clazz_signal, "value", "I"); jfieldID field_value = sync_env->GetFieldID(signalClass, "value", "I");
assert(field_value); assert(field_value);
jobjectArray values = (jobjectArray) sync_env->CallStaticObjectMethod(clazz_signal, jobjectArray values = (jobjectArray) sync_env->CallStaticObjectMethod(signalClass,
method_values); method_values);
assert(values); assert(values);
@ -389,6 +389,7 @@ extern "C" {
a->queue = queue; a->queue = queue;
messageClass = reinterpret_cast<jclass>(env->NewGlobalRef(findClass(env, "org/pEp/jniadapter/Message"))); messageClass = reinterpret_cast<jclass>(env->NewGlobalRef(findClass(env, "org/pEp/jniadapter/Message")));
identityClass = reinterpret_cast<jclass>(env->NewGlobalRef(findClass(env, "org/pEp/jniadapter/_Identity"))); identityClass = reinterpret_cast<jclass>(env->NewGlobalRef(findClass(env, "org/pEp/jniadapter/_Identity")));
signalClass = reinterpret_cast<jclass>(env->NewGlobalRef(findClass(env, "org/pEp/jniadapter/SyncHandshakeSignal")));
messageConstructorMethodID = env->GetMethodID(messageClass, "<init>", "(J)V"); messageConstructorMethodID = env->GetMethodID(messageClass, "<init>", "(J)V");
env->GetJavaVM(&a->sync_jvm); env->GetJavaVM(&a->sync_jvm);
@ -443,10 +444,12 @@ extern "C" {
env->DeleteGlobalRef(sync_obj); env->DeleteGlobalRef(sync_obj);
env->DeleteGlobalRef(messageClass); env->DeleteGlobalRef(messageClass);
env->DeleteGlobalRef(identityClass); env->DeleteGlobalRef(identityClass);
env->DeleteGlobalRef(signalClass);
sync_obj = NULL; sync_obj = NULL;
messageClass = NULL; messageClass = NULL;
identityClass = NULL; identityClass = NULL;
signalClass = NULL;
queue->push_front(NULL); queue->push_front(NULL);
pthread_join(*thread, NULL); pthread_join(*thread, NULL);

Write Preview
Loading…
Cancel
Save