1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed QJNIEnvironment reference counting.

Browse Source 
Change-Id: I02369e0c6472375efeffed577d39b764c591e025
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Yoann Lopes 2013-09-24 15:31:23 +02:00 committed by The Qt Project
parent 0b1e30aee4
commit 445efa40a2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/kernel/qjni.cpp
View File

@ -160,10 +160,12 @@ QJNIEnvironmentPrivate::QJNIEnvironmentPrivate()
: jniEnv(0) : jniEnv(0)
{ {
JavaVM *vm = QtAndroidPrivate::javaVM(); JavaVM *vm = QtAndroidPrivate::javaVM();
if (vm->GetEnv((void**)&jniEnv, JNI_VERSION_1_6) != JNI_EDETACHED) if (vm->GetEnv((void**)&jniEnv, JNI_VERSION_1_6) == JNI_EDETACHED) {
return; if (vm->AttachCurrentThread(&jniEnv, 0) < 0)
return;
}
if (vm->AttachCurrentThread(&jniEnv, 0) < 0) if (!jniEnv)
return; return;
if (!refCount->hasLocalData()) if (!refCount->hasLocalData())