From 83c81955bfbfe8fbe6daf215ca73e436747e3e60 Mon Sep 17 00:00:00 2001 From: Jeff Hao Date: Wed, 27 May 2015 19:29:29 -0700 Subject: Fix updating of JNI references for String.. Was missing updates to globals and weak globals. Bug: 21288130 Bug: 21440428 (cherry picked from commit 1a302fb4f84525289c1cf7a437f5be1999a75251) Change-Id: I41b64e8aae906f5986de483db096d8191e45f260 --- runtime/java_vm_ext.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'runtime/java_vm_ext.cc') diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc index b795d72a6a..3142089862 100644 --- a/runtime/java_vm_ext.cc +++ b/runtime/java_vm_ext.cc @@ -562,6 +562,11 @@ mirror::Object* JavaVMExt::DecodeGlobal(Thread* self, IndirectRef ref) { return globals_.SynchronizedGet(self, &globals_lock_, ref); } +void JavaVMExt::UpdateGlobal(Thread* self, IndirectRef ref, mirror::Object* result) { + WriterMutexLock mu(self, globals_lock_); + globals_.Update(ref, result); +} + mirror::Object* JavaVMExt::DecodeWeakGlobal(Thread* self, IndirectRef ref) { MutexLock mu(self, weak_globals_lock_); while (UNLIKELY(!allow_new_weak_globals_)) { @@ -570,6 +575,11 @@ mirror::Object* JavaVMExt::DecodeWeakGlobal(Thread* self, IndirectRef ref) { return weak_globals_.Get(ref); } +void JavaVMExt::UpdateWeakGlobal(Thread* self, IndirectRef ref, mirror::Object* result) { + MutexLock mu(self, weak_globals_lock_); + weak_globals_.Update(ref, result); +} + void JavaVMExt::DumpReferenceTables(std::ostream& os) { Thread* self = Thread::Current(); { -- cgit v1.2.3-59-g8ed1b