# HG changeset patch # User smarks # Date 1301012800 25200 # Node ID f6166b27446e770b3c14318acb6738321d592481 # Parent ceee82509f6b0a2ccb292bc78d4814b4e5daea89 7029680: fix test/sun/misc/Version/Version.java build parsing Reviewed-by: ohair diff -r ceee82509f6b -r f6166b27446e jdk/test/sun/misc/Version/Version.java --- a/jdk/test/sun/misc/Version/Version.java Thu Mar 24 11:40:13 2011 -0700 +++ b/jdk/test/sun/misc/Version/Version.java Thu Mar 24 17:26:40 2011 -0700 @@ -142,15 +142,21 @@ // non-product VM will have -debug|-release appended cs = cs.subSequence(1, cs.length()); String[] res = cs.toString().split("-"); - for (String s : res) { + for (int i = res.length - 1; i >= 0; i--) { + String s = res[i]; if (s.charAt(0) == 'b') { - build = - Integer.valueOf(s.substring(1, s.length())).intValue(); - break; + try { + build = Integer.parseInt(s.substring(1, s.length())); + break; + } catch (NumberFormatException nfe) { + // ignore + } } } } } - return new VersionInfo(major, minor, micro, update, special, build); + VersionInfo vi = new VersionInfo(major, minor, micro, update, special, build); + System.out.printf("newVersionInfo: input=%s output=%s\n", version, vi); + return vi; } }