diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-06-16 10:15:02 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-06-16 23:58:31 +0000 |
| commit | 6b648a78aaee08ba34be55730f6b8e99020f232b (patch) | |
| tree | 3752344b9b41c49371affbaedc5a3b342612e153 | |
| parent | 6dfb866afd4e9b0ea748953276901c47dfbacb95 (diff) | |
| download | idea-6b648a78aaee08ba34be55730f6b8e99020f232b.tar.gz | |
Warn if using Open JDK.
Open JDK users continue to report intermittent performance issues such
as the IDE coming to a crawl after use for longer periods of time.
Change-Id: I28088a938e500d39e57182dd52f3413300478da7
(cherry picked from commit ac56866420dbdaaef953828c332ef88876d34c56)
| -rw-r--r-- | platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java | 2 | ||||
| -rw-r--r-- | platform/platform-resources-en/src/messages/IdeBundle.properties | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java b/platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java index f8c4e3cae144..29ad33b8cf0b 100644 --- a/platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java +++ b/platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java @@ -66,7 +66,7 @@ public class SystemHealthMonitor extends ApplicationComponent.Adapter { } private void checkJvm() { - if (StringUtil.containsIgnoreCase(System.getProperty("java.vm.name", ""), "OpenJDK") && !SystemInfo.isJavaVersionAtLeast("1.7")) { + if (StringUtil.containsIgnoreCase(System.getProperty("java.vm.name", ""), "OpenJDK")) { notifyUnsupportedJvm("unsupported.jvm.openjdk.message"); } else if (StringUtil.endsWithIgnoreCase(System.getProperty("java.version", ""), "-ea")) { diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties index af0753197a74..5ca152bc0ab0 100644 --- a/platform/platform-resources-en/src/messages/IdeBundle.properties +++ b/platform/platform-resources-en/src/messages/IdeBundle.properties @@ -1097,7 +1097,7 @@ FileChooser.refreshActionLabelText=Refresh browsers.settings=Web Browsers updates.check.period.on.exit=On every exit -unsupported.jvm.openjdk.message=OpenJDK 6 is not supported. Please use Oracle Java or newer OpenJDK. +unsupported.jvm.openjdk.message=OpenJDK shows intermittent performance and UI issues. We recommend using the Oracle JRE/JDK. unsupported.jvm.ea.message=Early Access Java versions may cause compatibility issues. Please use stable release. unsupported.jvm.link=<br/><a href="#">Do not show again</a>. |