commit f43f03a2ace71a6f45eb4861d77d6a4064ffd06f
author Elliott Hughes <enh@google.com> Mon Oct 03 16:45:31 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 03 16:45:31 2011 -0700
tree 17451ec1d0e04e4cc4d69b04321718eb2620af72
parent df59a25b4483d5810491ec5ff4274bfffb259bfd
parent 6c8867daab4af4667e0e816f6beafa7c5d13e043

Merge "Implement artThrowVerificationErrorFromCode." into dalvik-dev

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index eade908..a8703da 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -2247,7 +2247,10 @@
       resolved = FindClass(descriptor, class_loader);
     }
     if (resolved != NULL) {
-      Class* check = resolved->IsArrayClass() ? resolved->GetComponentType() : resolved;
+      Class* check = resolved;
+      while (check->IsArrayClass()) {
+        check = check->GetComponentType();
+      }
       if (dex_cache != check->GetDexCache()) {
         if (check->GetClassLoader() != NULL) {
           Thread::Current()->ThrowNewExceptionF("Ljava/lang/IllegalAccessError;",