summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dimitry Ivanov <dimitry@google.com> 2016-04-29 16:02:38 -0700
committer Dimitry Ivanov <dimitry@google.com> 2016-05-02 11:32:34 -0700
commit9e83422b27faa3f249ec32ad2cbaa34530bd3df1 (patch)
tree8181f77d4c239d54f3d18310b7f95f00764d7a8a
parentba20abcd1bf567bac34b82794c3630a0ca81be3d (diff)
Reset NativeLoader on DestroyJavaVM
Native loader keeps vector of weak references to classloader. ResetNativeLoader instructs it to clear this vector once JavaVM is destroyed. Bug: http://b/28453840 Change-Id: I45e38c45268a741d86ec686266b13fde7d5fb9a2
-rw-r--r--runtime/java_vm_ext.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc
index 35bb3c3301..79c320309c 100644
--- a/runtime/java_vm_ext.cc
+++ b/runtime/java_vm_ext.cc
@@ -318,6 +318,7 @@ class JII {
}
JavaVMExt* raw_vm = reinterpret_cast<JavaVMExt*>(vm);
delete raw_vm->GetRuntime();
+ android::ResetNativeLoader();
return JNI_OK;
}