mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-17 09:34:38 +02:00
8174823: Module system implementation refresh (3/2017)
Reviewed-by: sspitsyn, dholmes, lfoltan, mchung
This commit is contained in:
parent
a085f48913
commit
73165d34e4
8 changed files with 49 additions and 25 deletions
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
|
@ -3409,9 +3409,16 @@ static void call_initPhase2(TRAPS) {
|
|||
Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_System(), true, CHECK);
|
||||
instanceKlassHandle klass (THREAD, k);
|
||||
|
||||
JavaValue result(T_VOID);
|
||||
JavaValue result(T_INT);
|
||||
JavaCallArguments args;
|
||||
args.push_int(DisplayVMOutputToStderr);
|
||||
args.push_int(log_is_enabled(Debug, init)); // print stack trace if exception thrown
|
||||
JavaCalls::call_static(&result, klass, vmSymbols::initPhase2_name(),
|
||||
vmSymbols::void_method_signature(), CHECK);
|
||||
vmSymbols::boolean_boolean_int_signature(), &args, CHECK);
|
||||
if (result.get_jint() != JNI_OK) {
|
||||
vm_exit_during_initialization(); // no message or exception
|
||||
}
|
||||
|
||||
universe_post_module_init();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue