# HG changeset patch
# User iveresov
# Date 1301482118 25200
# Node ID bca1a5b8df1c11270a20a5d1a91b02eb02f5835e
# Parent  f82367de21f53e5e0f80da6d889b6bb956932c21# Parent  bc9f101d8df6b5568d4331c904478c167478bce1
Merge

diff -r f82367de21f5 -r bca1a5b8df1c hotspot/src/share/vm/oops/instanceKlass.cpp
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp	Tue Mar 29 22:25:17 2011 -0700
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp	Wed Mar 30 03:48:38 2011 -0700
@@ -2337,7 +2337,7 @@
     st->print_cr(BULLET"fake entry for oop_size: %d", java_lang_Class::oop_size(obj));
     st->print_cr(BULLET"fake entry for static_oop_field_count: %d", java_lang_Class::static_oop_field_count(obj));
     klassOop real_klass = java_lang_Class::as_klassOop(obj);
-    if (real_klass && real_klass->klass_part()->oop_is_instance()) {
+    if (real_klass != NULL && real_klass->klass_part()->oop_is_instance()) {
       instanceKlass::cast(real_klass)->do_local_static_fields(&print_field);
     }
   } else if (as_klassOop() == SystemDictionary::MethodType_klass()) {