From 755e8e13d87679b52e08b618ef4bdf22bb4d448e Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 20 Dec 2019 20:28:53 +0100 Subject: [PATCH] [java] making `JavaSdkImpl#getToolsPath` return correct value (i.e. `null`) on 9+ GitOrigin-RevId: 5d41b5310bbf396a8f937c75f94cb705b2117403 --- .../intellij/openapi/projectRoots/impl/JavaSdkImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java index b3bd14e25aef..f1afbad225f9 100644 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java +++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java @@ -27,7 +27,6 @@ import com.intellij.openapi.vfs.newvfs.events.VFileCreateEvent; import com.intellij.openapi.vfs.newvfs.events.VFileDeleteEvent; import com.intellij.openapi.vfs.newvfs.events.VFileEvent; import com.intellij.pom.java.LanguageLevel; -import com.intellij.util.Consumer; import com.intellij.util.PathUtil; import com.intellij.util.containers.JBIterable; import com.intellij.util.containers.MultiMap; @@ -156,9 +155,9 @@ public final class JavaSdkImpl extends JavaSdk { @Override public String getToolsPath(@NotNull Sdk sdk) { - final String versionString = sdk.getVersionString(); - final boolean isJdk1_x = versionString != null && (versionString.contains("1.0") || versionString.contains("1.1")); - return getConvertedHomePath(sdk) + "lib" + File.separator + (isJdk1_x? "classes.zip" : "tools.jar"); + JavaVersion version = getJavaVersion(sdk); + return version == null || version.feature > 9 ? null : + getConvertedHomePath(sdk) + "lib" + File.separator + (version.feature < 2 ? "classes.zip" : "tools.jar"); } @Override