commit c3fcd41f15dffbb5f28c9900f421471a3d2dd420
author Mathieu Chartier <mathieuc@google.com> Fri Sep 25 16:54:59 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Sep 28 18:01:30 2015 -0700
tree df1bb755238684ab5a01a79959c063a88801e218
parent ac87001cbbd44b436cc7866f7a41037ca83b17f1

Address some code comments

Change-Id: I0a38a387c4328d45bbc04d095bf3388c27495c12

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 8e42040..dbc5cec 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -1500,7 +1500,7 @@
   Thread* const self = Thread::Current();
   JavaVMExt* const vm = Runtime::Current()->GetJavaVM();
   for (const ClassLoaderData& data : class_loaders_) {
-    vm->DecodeWeakGlobalDuringShutdown(self, data.weak_root);
+    vm->DeleteWeakGlobalRef(self, data.weak_root);
     delete data.allocator;
     delete data.class_table;
   }
@@ -4186,6 +4186,8 @@
     data.allocator = Runtime::Current()->CreateLinearAlloc();
     class_loaders_.push_back(data);
     // Don't already have a class table, add it to the class loader.
+    CHECK(class_loader->GetClassTable() == nullptr);
+    CHECK(class_loader->GetAllocator() == nullptr);
     class_loader->SetClassTable(data.class_table);
     class_loader->SetAllocator(data.allocator);
   }