use JOSM Utils implementation to allow versions with hypens (i.e. 17-ea)

marianobarrios · Apr 16, 2022 · c216a49 · c216a49
1 parent 300cc81
commit c216a49
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/main/java/tlschannel/util/Util.java b/src/main/java/tlschannel/util/Util.java
@@ -31,13 +31,16 @@ public static String resultToString(SSLEngineResult result) {
   public static int getJavaMajorVersion() {
     String version = System.getProperty("java.version");
     if (version.startsWith("1.")) {
-      version = version.substring(2, 3);
-    } else {
-      int dot = version.indexOf(".");
-      if (dot != -1) {
-        version = version.substring(0, dot);
-      }
+      version = version.substring(2);
     }
-    return Integer.parseInt(version);
+    // Allow these formats:
+    // 1.8.0_72-ea
+    // 9-ea
+    // 9
+    // 9.0.1
+    int dotPos = version.indexOf('.');
+    int dashPos = version.indexOf('-');
+    return Integer.parseInt(version.substring(0,
+            dotPos > -1 ? dotPos : dashPos > -1 ? dashPos : 1));
   }
 }