commit efbdefbf4f48990769fc98857a605dac62f3e29c
author Ian Rogers <irogers@google.com> Wed Feb 29 09:03:00 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 29 09:03:00 2012 -0800
tree 6f2318aa80cb9698532e04b1f8c74a3ac289ac99
parent ba80a64fdb97a4c641c777d26ca3efb4c70da144
parent 0d6de041f3777f6d403c831e8db32040804bcdf5

Merge "Fix JNI stub dlsym regression" into dalvik-dev

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index f6d555d..700174e 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -1398,7 +1398,8 @@
   if (method->IsStatic() && !method->IsConstructor()) {
     // For static methods excluding the class initializer, install the trampoline
     method->SetCode(runtime->GetResolutionStubArray(Runtime::kStaticMethod)->GetData());
-  } else if (method->IsNative()) {
+  }
+  if (method->IsNative()) {
     // unregistering restores the dlsym lookup stub
     method->UnregisterNative(Thread::Current());
   }