OpenJDK / jdk / hs
changeset 8877:bca1a5b8df1c
Merge
| author | iveresov |
|---|---|
| date | Wed, 30 Mar 2011 03:48:38 -0700 |
| parents | f82367de21f5 bc9f101d8df6 |
| children | a6283814032c |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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()) {