From 9869f90b1a378d56255d3de26db35d8a14d591d2 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 31 May 2012 13:54:19 +0400 Subject: [PATCH] Fix startup Java version check --- .../platform-impl/src/com/intellij/idea/StartupUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java index 5412e6e1f3eb..9d74ae78735d 100644 --- a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java +++ b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java @@ -89,9 +89,9 @@ public class StartupUtil { if (!"true".equals(System.getProperty("idea.no.jdk.check"))) { final String version = System.getProperty("java.version"); - if (!version.startsWith("1.6") && !version.startsWith("1.7")) { - showError("Java Version Mismatch", "The JDK version is " + version + "\n." + - ApplicationNamesInfo.getInstance().getProductName() + " requires JDK 1.6 or 1.7."); + if (!SystemInfo.isJavaVersionAtLeast("1.6")) { + showError("Java Version Mismatch", "The JDK version is " + version + ".\n" + + ApplicationNamesInfo.getInstance().getProductName() + " requires JDK 1.6 or higher."); return false; } }