corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 963242 - Only save JNI env in TLS when first attaching; r=kats

Browse Source
This commit is contained in:
Jim Chen
2014-01-28 18:32:28 -06:00
parent 8e620f3dba
commit bb17876642
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
widget/android/AndroidBridge.cpp
View File

@@ -277,8 +277,11 @@ extern "C" {
return jEnv;
}
JavaVM *jVm = mozilla::AndroidBridge::GetVM();
if (!jVm->GetEnv(reinterpret_cast<void**>(&jEnv), JNI_VERSION_1_2) ||
!jVm->AttachCurrentThread(&jEnv, nullptr)) {
if (!jVm->GetEnv(reinterpret_cast<void**>(&jEnv), JNI_VERSION_1_2)) {
MOZ_ASSERT(jEnv);
return jEnv;
}
if (!jVm->AttachCurrentThread(&jEnv, nullptr)) {
MOZ_ASSERT(jEnv);
PR_SetThreadPrivate(sJavaEnvThreadIndex, jEnv);
return jEnv;