--- old/src/hotspot/share/runtime/thread.cpp 2018-02-15 20:03:29.000000000 -0800 +++ new/src/hotspot/share/runtime/thread.cpp 2018-02-15 20:03:29.000000000 -0800 @@ -4202,10 +4202,9 @@ // SystemDictionary::resolve_or_null will return null if there was // an exception. If we cannot load the Shutdown class, just don't // call Shutdown.shutdown() at all. This will mean the shutdown hooks - // and finalizers (if runFinalizersOnExit is set) won't be run. - // Note that if a shutdown hook was registered or runFinalizersOnExit - // was called, the Shutdown class would have already been loaded - // (Runtime.addShutdownHook and runFinalizersOnExit will load it). + // won't be run. Note that if a shutdown hook was registered, + // the Shutdown class would have already been loaded + // (Runtime.addShutdownHook will load it). JavaValue result(T_VOID); JavaCalls::call_static(&result, shutdown_klass,