commit 827645f27237f3e77c87cb5e49e90389a22337a6
author Brian Carlstrom <bdc@google.com> Wed Sep 10 18:02:55 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 10 18:02:55 2014 +0000
tree 747d1143ba6b4dfa48d633a27180e2326506fd1b
parent 44332cc21494726c9ba90ac8f23af8acc2dc4536
parent 72da76359aa5599f78ddca79b294e9bf30e004ed

Merge "Ensure class is linked before resolution" into lmp-dev

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 26f32f9..9d67b8c 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -2066,7 +2066,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);