archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-24 21:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Iris Clark 2015-09-29 17:57:55 -07:00
commit 34406f46c6
43 changed files with 627 additions and 964 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/classfile/classLoader.cpp
View file

@ -155,7 +155,7 @@ static const char* get_jimage_version_string() {
static char version_string[10] = "";
if (version_string[0] == '\0') {
jio_snprintf(version_string, sizeof(version_string), "%d.%d",
Abstract_VM_Version::vm_minor_version(), Abstract_VM_Version::vm_micro_version());
Abstract_VM_Version::vm_major_version(), Abstract_VM_Version::vm_minor_version());
}
return (const char*)version_string;
}