commit 7540ff4b6ad0ff5d8c5f60658b66155caf3a7cbc
author Brian Carlstrom <bdc@google.com> Sun Sep 04 16:38:46 2011 -0700
committer Brian Carlstrom <bdc@google.com> Thu Sep 08 17:10:58 2011 -0700
tree a3a1c5df402f076a8485b3b31150d00f48abd0cd
parent 693267ad474039981e9be20a592ac2e4e3bd742e

Small change to make CompilerTest.CompileDexLibCore pass

Change-Id: Id5989a369acec41faae4bbd949b8979962384b2c

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index 0df0cb7..01e283e 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -2114,10 +2114,10 @@
 
   const char* name = dex_file.dexStringById(method_id.name_idx_);
   std::string signature(dex_file.CreateMethodDescriptor(method_id.proto_idx_, NULL));
-  if (klass->IsInterface()) {
-    resolved = klass->FindInterfaceMethod(name, signature);
-  } else if (is_direct) {
+  if (is_direct) {
     resolved = klass->FindDirectMethod(name, signature);
+  } else if (klass->IsInterface()) {
+    resolved = klass->FindInterfaceMethod(name, signature);
   } else {
     resolved = klass->FindVirtualMethod(name, signature);
   }