commit 2adccb618c0de207fde96e5e90ce99c79eb8eb85
author Mathieu Chartier <mathieuc@google.com> Wed Sep 10 18:29:32 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 10 18:29:32 2014 +0000
tree c7588d59075c51969fb2a46edb09a1fefeb9a848
parent 833ec8ff84a25078f5755489d7a36db3015c069a
parent 1a465ca32178292888d3dc34b1cd784432a35848

Merge "Ensure class is linked before resolution"

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 637fd02..26b6c60 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -2140,7 +2140,7 @@
       if (pair.second != nullptr) {
         mirror::Class* klass = LookupClass(descriptor, nullptr);
         if (klass != nullptr) {
-          return klass;
+          return EnsureResolved(self, descriptor, klass);
         }
         klass = DefineClass(descriptor, NullHandle<mirror::ClassLoader>(), *pair.first,
                             *pair.second);