IDEA-135970 (adjusted path included in JDK validation)

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 dbc4330202a8aef55d32dbe5a26314772ba3bad0..4ee28ed0cbe37e9c404aebdc4d14e479bcdf4b54 100644 (file)
--- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
+++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
@@ -241,8 +241,11 @@ public class JavaSdkImpl extends JavaSdk {
     final FileChooserDescriptor descriptor = new FileChooserDescriptor(baseDescriptor) {
       @Override
       public void validateSelectedFiles(VirtualFile[] files) throws Exception {
-        if (files.length > 0 && JrtFileSystem.isModularJdk(files[0].getPath()) && !JrtFileSystem.isSupported()) {
-          throw new Exception(LangBundle.message("jrt.not.available.message"));
+        if (files.length > 0 && !JrtFileSystem.isSupported()) {
+          String path = files[0].getPath();
+          if (JrtFileSystem.isModularJdk(path) || JrtFileSystem.isModularJdk(adjustSelectedSdkHome(path))) {
+            throw new Exception(LangBundle.message("jrt.not.available.message"));
+          }
         }
         baseDescriptor.validateSelectedFiles(files);
       }