src/share/vm/runtime/java.cpp

changeset 662
8d852b81e775
parent 496
5a76ab815e34
child 670
9c2ecc2ffb12
     1.1 --- a/src/share/vm/runtime/java.cpp	Tue Jun 17 13:08:15 2008 -0700
     1.2 +++ b/src/share/vm/runtime/java.cpp	Sun Jun 22 20:07:58 2008 -0700
     1.3 @@ -502,9 +502,9 @@
     1.4    os::shutdown();
     1.5  }
     1.6  
     1.7 -void vm_abort() {
     1.8 +void vm_abort(bool dump_core) {
     1.9    vm_perform_shutdown_actions();
    1.10 -  os::abort(PRODUCT_ONLY(false));
    1.11 +  os::abort(dump_core);
    1.12    ShouldNotReachHere();
    1.13  }
    1.14  
    1.15 @@ -538,18 +538,24 @@
    1.16    java_lang_Throwable::print_stack_trace(exception(), tty);
    1.17    tty->cr();
    1.18    vm_notify_during_shutdown(NULL, NULL);
    1.19 -  vm_abort();
    1.20 +
    1.21 +  // Failure during initialization, we don't want to dump core
    1.22 +  vm_abort(false);
    1.23  }
    1.24  
    1.25  void vm_exit_during_initialization(symbolHandle ex, const char* message) {
    1.26    ResourceMark rm;
    1.27    vm_notify_during_shutdown(ex->as_C_string(), message);
    1.28 -  vm_abort();
    1.29 +
    1.30 +  // Failure during initialization, we don't want to dump core
    1.31 +  vm_abort(false);
    1.32  }
    1.33  
    1.34  void vm_exit_during_initialization(const char* error, const char* message) {
    1.35    vm_notify_during_shutdown(error, message);
    1.36 -  vm_abort();
    1.37 +
    1.38 +  // Failure during initialization, we don't want to dump core
    1.39 +  vm_abort(false);
    1.40  }
    1.41  
    1.42  void vm_shutdown_during_initialization(const char* error, const char* message) {

mercurial