From 946c14ab4d69ac4c0742178d94f254233017034a Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 1 Jun 2018 23:02:06 +1200
Subject: Update Java version test tool

---
 setup/java-test/Test.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'setup/java-test/Test.java')

diff --git a/setup/java-test/Test.java b/setup/java-test/Test.java
index 363d6953e..7d1b3972d 100644
--- a/setup/java-test/Test.java
+++ b/setup/java-test/Test.java
@@ -1,5 +1,10 @@
 public class Test {
     public static void main(String[] a) {
-    	System.exit(Integer.parseInt(System.getProperty("java.version").split("\\.")[1]) >= 7 ? 0 : 1);
+        String[] versions = System.getProperty("java.version").split("\\.");
+        int major = Integer.parseInt(versions[0]);
+        if (major == 1) {
+            major = Integer.parseInt(versions[1]);
+        }
+    	System.exit(major >= 7 ? 0 : 1);
     }
 }
-- 
cgit v1.2.3