stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8146222: assert(_initialized) failed: TLS not initialized yet!

Browse Source 
Reviewed-by: dcubed
This commit is contained in:
David Holmes 2016-01-10 20:02:50 -05:00
parent 1a0f49140b
commit 9760f7ac92
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hotspot/src/share/vm/runtime/thread.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -3390,13 +3390,16 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
// Check version // Check version
if (!is_supported_jni_version(args->version)) return JNI_EVERSION; if (!is_supported_jni_version(args->version)) return JNI_EVERSION;
// Initialize library-based TLS
ThreadLocalStorage::init();
// Initialize the output stream module // Initialize the output stream module
ostream_init(); ostream_init();
// Process java launcher properties. // Process java launcher properties.
Arguments::process_sun_java_launcher_properties(args); Arguments::process_sun_java_launcher_properties(args);
// Initialize the os module before using TLS // Initialize the os module
os::init(); os::init();
// Record VM creation timing statistics // Record VM creation timing statistics
@ -3451,9 +3454,6 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
jint adjust_after_os_result = Arguments::adjust_after_os(); jint adjust_after_os_result = Arguments::adjust_after_os();
if (adjust_after_os_result != JNI_OK) return adjust_after_os_result; if (adjust_after_os_result != JNI_OK) return adjust_after_os_result;
// Initialize library-based TLS
ThreadLocalStorage::init();
// Initialize output stream logging // Initialize output stream logging
ostream_init_log(); ostream_init_log();