comparison src/share/vm/services/threadService.cpp @ 356:1ee8caae33af

Merge
author tonyp
date Thu, 21 Aug 2008 23:36:31 -0400
parents d95b224e9f17
children 6a93908f268f
comparison
equal deleted inserted replaced
355:0edda524b58c 356:1ee8caae33af
1 /* 1 /*
2 * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. 2 * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
742 } 742 }
743 } 743 }
744 } 744 }
745 745
746 // Support for JSR-166 locks 746 // Support for JSR-166 locks
747 if (JDK_Version::supports_thread_park_blocker() && 747 if (JDK_Version::current().supports_thread_park_blocker() &&
748 (_thread_status == java_lang_Thread::PARKED || 748 (_thread_status == java_lang_Thread::PARKED ||
749 _thread_status == java_lang_Thread::PARKED_TIMED)) { 749 _thread_status == java_lang_Thread::PARKED_TIMED)) {
750 750
751 _blocker_object = thread->current_park_blocker(); 751 _blocker_object = thread->current_park_blocker();
752 if (_blocker_object != NULL && _blocker_object->is_a(SystemDictionary::abstract_ownable_synchronizer_klass())) { 752 if (_blocker_object != NULL && _blocker_object->is_a(SystemDictionary::abstract_ownable_synchronizer_klass())) {