archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 01:54:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Coleen Phillimore 2015-06-19 13:03:58 +00:00
commit 97f69e8b42
66 changed files with 808 additions and 462 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hotspot/src/share/vm/runtime/thread.cpp
View file

@ -3274,6 +3274,9 @@ void Threads::initialize_jsr292_core_classes(TRAPS) {
jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
extern void JDK_Version_init();
// Preinitialize version info.
VM_Version::early_initialize();
// Check version
if (!is_supported_jni_version(args->version)) return JNI_EVERSION;