Recognize Java 9.0.1

tinylog-org · Nov 14, 2017 · d2acda3 · d2acda3
1 parent 24a205f
commit d2acda3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/tinylog-core/src/org/pmw/tinylog/EnvironmentHelper.java b/tinylog-core/src/org/pmw/tinylog/EnvironmentHelper.java
@@ -38,7 +38,15 @@ private EnvironmentHelper() {
 	 */
 	public static boolean isAtLeastJava9() {
 		String version = System.getProperty("java.version");
-		return version != null && version.matches("[0-9]{1,8}") && Integer.parseInt(version) >= 9;
+		if (version == null) {
+			return false;
+		} else {
+			int index = version.indexOf('.');
+			if (index > 0) {
+				version = version.substring(0, index);
+			}
+			return version.matches("[0-9]{1,8}") && Integer.parseInt(version) >= 9;
+		}
 	}
 
 	/**

diff --git a/tinylog-core/test/org/pmw/tinylog/EnvironmentHelperTest.java b/tinylog-core/test/org/pmw/tinylog/EnvironmentHelperTest.java
@@ -89,6 +89,9 @@ public final void testDetectingJava9OrHigher() {
 			System.setProperty("java.version", "9");
 			assertTrue(EnvironmentHelper.isAtLeastJava9());
 
+			System.setProperty("java.version", "9.0.1");
+			assertTrue(EnvironmentHelper.isAtLeastJava9());
+
 			System.setProperty("java.version", "10");
 			assertTrue(EnvironmentHelper.isAtLeastJava9());
 		} finally {
@@ -217,7 +220,6 @@ public final void testReceivingLegacyJavaDialect() {
 		}
 	}
 
-
 	/**
 	 * Test receiving {@class ModernJavaRuntime} as runtime dialect on Java 9 or higher.
 	 */
@@ -228,6 +230,9 @@ public final void testReceivingModernJavaDialect() {
 			System.setProperty("java.version", "9");
 			assertThat(Deencapsulation.invoke(EnvironmentHelper.class, "resolveDialect"), instanceOf(ModernJavaRuntime.class));
 
+			System.setProperty("java.version", "9.0.1");
+			assertThat(Deencapsulation.invoke(EnvironmentHelper.class, "resolveDialect"), instanceOf(ModernJavaRuntime.class));
+
 			System.setProperty("java.version", "10");
 			assertThat(Deencapsulation.invoke(EnvironmentHelper.class, "resolveDialect"), instanceOf(ModernJavaRuntime.class));
 		} finally {