1.1 --- a/src/share/vm/classfile/javaAssertions.cpp Fri Aug 31 16:39:35 2012 -0700 1.2 +++ b/src/share/vm/classfile/javaAssertions.cpp Sat Sep 01 13:25:18 2012 -0400 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2000, 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 @@ -94,7 +94,7 @@ 1.11 1.12 oop JavaAssertions::createAssertionStatusDirectives(TRAPS) { 1.13 Symbol* asd_sym = vmSymbols::java_lang_AssertionStatusDirectives(); 1.14 - klassOop k = SystemDictionary::resolve_or_fail(asd_sym, true, CHECK_NULL); 1.15 + Klass* k = SystemDictionary::resolve_or_fail(asd_sym, true, CHECK_NULL); 1.16 instanceKlassHandle asd_klass (THREAD, k); 1.17 asd_klass->initialize(CHECK_NULL); 1.18 Handle h = asd_klass->allocate_instance_handle(CHECK_NULL);