Merge "Fixed class linker ResolveType for multi-dimensional arrays." into dalvik-dev
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;",