1.1 --- a/src/share/vm/services/attachListener.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/services/attachListener.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2005, 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 @@ -44,8 +44,8 @@
1.11 // Invokes sun.misc.VMSupport.serializePropertiesToByteArray to serialize
1.12 // the system properties into a byte array.
1.13
1.14 -static klassOop load_and_initialize_klass(Symbol* sh, TRAPS) {
1.15 - klassOop k = SystemDictionary::resolve_or_fail(sh, true, CHECK_NULL);
1.16 +static Klass* load_and_initialize_klass(Symbol* sh, TRAPS) {
1.17 + Klass* k = SystemDictionary::resolve_or_fail(sh, true, CHECK_NULL);
1.18 instanceKlassHandle ik (THREAD, k);
1.19 if (ik->should_be_initialized()) {
1.20 ik->initialize(CHECK_NULL);
1.21 @@ -59,7 +59,7 @@
1.22
1.23 // load sun.misc.VMSupport
1.24 Symbol* klass = vmSymbols::sun_misc_VMSupport();
1.25 - klassOop k = load_and_initialize_klass(klass, THREAD);
1.26 + Klass* k = load_and_initialize_klass(klass, THREAD);
1.27 if (HAS_PENDING_EXCEPTION) {
1.28 java_lang_Throwable::print(PENDING_EXCEPTION, out);
1.29 CLEAR_PENDING_EXCEPTION;
1.30 @@ -456,7 +456,7 @@
1.31 // Starts the Attach Listener thread
1.32 void AttachListener::init() {
1.33 EXCEPTION_MARK;
1.34 - klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_Thread(), true, CHECK);
1.35 + Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_Thread(), true, CHECK);
1.36 instanceKlassHandle klass (THREAD, k);
1.37 instanceHandle thread_oop = klass->allocate_instance_handle(CHECK);
1.38
