src/share/vm/runtime/thread.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2016, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 3407,3419 ****
    TraceTime timer("Phase2 initialization", TRACETIME_LOG(Info, modules, startuptime));
  
    Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_System(), true, CHECK);
    instanceKlassHandle klass (THREAD, k);
  
!   JavaValue result(T_VOID);
    JavaCalls::call_static(&result, klass, vmSymbols::initPhase2_name(),
!                                          vmSymbols::void_method_signature(), CHECK);
    universe_post_module_init();
  }
  
  // Phase 3. final setup - set security manager, system class loader and TCCL
  //
--- 3407,3426 ----
    TraceTime timer("Phase2 initialization", TRACETIME_LOG(Info, modules, startuptime));
  
    Klass* k = SystemDictionary::resolve_or_fail(vmSymbols::java_lang_System(), true, CHECK);
    instanceKlassHandle klass (THREAD, k);
  
!   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::boolean_boolean_int_signature(), &args, CHECK);
!   if (result.get_jint() != JNI_OK) {
!     vm_exit_during_initialization(); // no message or exception
!   }
! 
    universe_post_module_init();
  }
  
  // Phase 3. final setup - set security manager, system class loader and TCCL
  //