1.1 --- a/src/share/vm/interpreter/linkResolver.cpp Fri Mar 11 21:19:15 2011 -0800
1.2 +++ b/src/share/vm/interpreter/linkResolver.cpp Fri Mar 11 22:33:47 2011 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2011, 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 @@ -221,7 +221,9 @@
1.11 // Make sure the Java part of the runtime has been booted up.
1.12 klassOop natives = SystemDictionary::MethodHandleNatives_klass();
1.13 if (natives == NULL || instanceKlass::cast(natives)->is_not_initialized()) {
1.14 - SystemDictionary::resolve_or_fail(vmSymbols::sun_dyn_MethodHandleNatives(),
1.15 + Symbol* natives_name = vmSymbols::java_dyn_MethodHandleNatives();
1.16 + if (natives != NULL && AllowTransitionalJSR292) natives_name = Klass::cast(natives)->name();
1.17 + SystemDictionary::resolve_or_fail(natives_name,
1.18 Handle(),
1.19 Handle(),
1.20 true,
