# HG changeset patch
# User xlu
# Date 1224281882 25200
# Node ID 7b51912bdf9a324bc41ee2b0c80e7f7cbd183b63
# Parent  443791f333a2656f490b73d9c017f8be895fc574# Parent  1bf7a2ce489587bb45f4295191e1c97004219a68
Merge

diff -r 1bf7a2ce4895 -r 7b51912bdf9a src/share/vm/oops/objArrayKlass.cpp
--- a/src/share/vm/oops/objArrayKlass.cpp	Thu Oct 16 11:07:39 2008 -0700
+++ b/src/share/vm/oops/objArrayKlass.cpp	Fri Oct 17 15:18:02 2008 -0700
@@ -475,8 +475,8 @@
     assert(Universe::is_bootstrapping(), "partial objArray only at startup");
     return JVM_ACC_ABSTRACT | JVM_ACC_FINAL | JVM_ACC_PUBLIC;
   }
-  // Recurse down the element list
-  jint element_flags = Klass::cast(element_klass())->compute_modifier_flags(CHECK_0);
+  // Return the flags of the bottom element type.
+  jint element_flags = Klass::cast(bottom_klass())->compute_modifier_flags(CHECK_0);
 
   return (element_flags & (JVM_ACC_PUBLIC | JVM_ACC_PRIVATE | JVM_ACC_PROTECTED))
                         | (JVM_ACC_ABSTRACT | JVM_ACC_FINAL);