Cope with java version becoming 9.X rather than 1.9.X

1 files changed, 15 insertions, 6 deletions

diff --git a/util/src/org/aspectj/util/LangUtil.java b/util/src/org/aspectj/util/LangUtil.java
index cf929b7b5..49caba6b7 100644
--- a/util/src/org/aspectj/util/LangUtil.java
+++ b/util/src/org/aspectj/util/LangUtil.java
@@ -71,12 +71,17 @@ public class LangUtil {
 						.printStackTrace(System.err);
 				vmVersion = 1.5;
 			} else {
-				try {
-					String versionString = vm.substring(0, 3);
-					Double temp = new Double(Double.parseDouble(versionString));
-					vmVersion = temp.doubleValue();
-				} catch (Exception e) {
-					vmVersion = 1.4;
+				if (vm.startsWith("9")) {
+					// JDK 9 beta 99 starts using 9-ea as the version string.
+					vmVersion = 1.9;
+				} else {
+					try {
+						String versionString = vm.substring(0, 3);
+						Double temp = new Double(Double.parseDouble(versionString));
+						vmVersion = temp.doubleValue();
+					} catch (Exception e) {
+						vmVersion = 1.4;
+					}
 				}
 			}
 		} catch (Throwable t) {
@@ -110,6 +115,10 @@ public class LangUtil {
 	public static boolean is18VMOrGreater() {
 		return 1.8 <= vmVersion;
 	}
+	
+	public static boolean is19VMOrGreater() {
+		return 1.9 <= vmVersion;
+	}
 
 	/**
 	 * Shorthand for "if null, throw IllegalArgumentException"