archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 09:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Igor Veresov 2010-01-06 22:21:39 -08:00
commit 5bec0d60ab
144 changed files with 4007 additions and 823 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hotspot/src/share/vm/prims/jvmtiExport.cpp
View file

@ -656,7 +656,7 @@ static inline klassOop oop_to_klassOop(oop obj) {
klassOop k = obj->klass();
// if the object is a java.lang.Class then return the java mirror
if (k == SystemDictionary::class_klass()) {
if (k == SystemDictionary::Class_klass()) {
if (!java_lang_Class::is_primitive(obj)) {
k = java_lang_Class::as_klassOop(obj);
assert(k != NULL, "class for non-primitive mirror must exist");
@ -1925,7 +1925,7 @@ void JvmtiExport::record_vm_internal_object_allocation(oop obj) {
if (collector != NULL && collector->is_enabled()) {
// Don't record classes as these will be notified via the ClassLoad
// event.
if (obj->klass() != SystemDictionary::class_klass()) {
if (obj->klass() != SystemDictionary::Class_klass()) {
collector->record_allocation(obj);
}
}