1.1 --- a/src/share/vm/runtime/reflectionUtils.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/runtime/reflectionUtils.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -30,7 +30,7 @@
1.11 KlassStream::KlassStream(instanceKlassHandle klass, bool local_only, bool classes_only) {
1.12 _klass = klass;
1.13 if (classes_only) {
1.14 - _interfaces = Universe::the_empty_system_obj_array();
1.15 + _interfaces = Universe::the_empty_klass_array();
1.16 } else {
1.17 _interfaces = klass->transitive_interfaces();
1.18 }
1.19 @@ -47,7 +47,7 @@
1.20 _klass = _klass->super();
1.21 } else {
1.22 if (_interface_index > 0) {
1.23 - _klass = klassOop(_interfaces->obj_at(--_interface_index));
1.24 + _klass = _interfaces->at(--_interface_index);
1.25 } else {
1.26 return true;
1.27 }
1.28 @@ -70,7 +70,7 @@
1.29 if (JDK_Version::is_gte_jdk16x_version()) {
1.30 // The following class fields do not exist in
1.31 // previous version of jdk.
1.32 - offset = sun_reflect_ConstantPool::cp_oop_offset();
1.33 + offset = sun_reflect_ConstantPool::oop_offset();
1.34 _filtered_fields->append(new FilteredField(SystemDictionary::reflect_ConstantPool_klass(), offset));
1.35 offset = sun_reflect_UnsafeStaticFieldAccessorImpl::base_offset();
1.36 _filtered_fields->append(new FilteredField(SystemDictionary::reflect_UnsafeStaticFieldAccessorImpl_klass(), offset));
