changeset 8476:b015efd2ab82

8145017: Add support for 3 digit hotspot minor version numbers Reviewed-by: coffeys
author robm
date Thu, 10 Dec 2015 12:21:26 +0000
parents c2ba29a6b98f
children cc1ed9a35188
files src/share/native/common/jdk_util.c test/sun/misc/Version/Version.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/common/jdk_util.c	Thu Jul 21 22:47:30 2016 +0100
+++ b/src/share/native/common/jdk_util.c	Thu Dec 10 12:21:26 2015 +0000
@@ -53,7 +53,7 @@
     const char* jdk_update_string = JDK_UPDATE_VERSION;
     unsigned int jdk_update_version = 0;
     int len_update_ver = 0;
-    char update_ver[3];
+    char update_ver[5];
     char jdk_special_version = '\0';
 
     /* If the JDK_BUILD_NUMBER is of format bXX and XX is an integer
--- a/test/sun/misc/Version/Version.java	Thu Jul 21 22:47:30 2016 +0100
+++ b/test/sun/misc/Version/Version.java	Thu Dec 10 12:21:26 2015 +0000
@@ -146,7 +146,7 @@
 
             String regex = "^([0-9]{1,2})";     // major
             regex += "\\.";                     // separator
-            regex += "([0-9]{1,2})";            // minor
+            regex += "([0-9]{1,3})";            // minor
             regex += "(\\-b([0-9]{1,3}))";      // JVM -bxx
             regex += ".*";