8032678: [TESTBUG] sun/misc/Version/Version.java doesn't understand two-digit HotSpot minor version numbers
Reviewed-by: kvn
This commit is contained in:
parent
786fc24463
commit
c329a619fd
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -116,11 +116,17 @@ public class Version {
|
||||
} else if (Character.isDigit(cs.charAt(0)) &&
|
||||
Character.isDigit(cs.charAt(1)) && cs.charAt(2) == '.' &&
|
||||
Character.isDigit(cs.charAt(3))) {
|
||||
// HSX has nn.n (major.minor) version
|
||||
// HSX has nn.n[n] (major.minor) version
|
||||
major = Integer.valueOf(version.substring(0, 2)).intValue();
|
||||
if (Character.isDigit(cs.charAt(4))) {
|
||||
minor = Integer.valueOf(version.substring(3, 5)).intValue();
|
||||
cs = cs.subSequence(5, cs.length());
|
||||
}
|
||||
else {
|
||||
minor = Character.digit(cs.charAt(3), 10);
|
||||
cs = cs.subSequence(4, cs.length());
|
||||
}
|
||||
}
|
||||
if (cs.charAt(0) == '_' && cs.length() >= 3 &&
|
||||
Character.isDigit(cs.charAt(1)) &&
|
||||
Character.isDigit(cs.charAt(2))) {
|
||||
|
Loading…
Reference in New Issue
Block a user