From d2358a36b1878b6520bb487111214f87f4a072f5 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Fri, 28 Apr 2017 13:41:32 +0300 Subject: [PATCH] fixed finding JDK in java.home --- .../intellij/openapi/projectRoots/impl/JavaHomeFinder.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinder.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinder.java index 630d3450acf5..a6d61fab62ab 100644 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinder.java +++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinder.java @@ -64,8 +64,10 @@ public abstract class JavaHomeFinder { return new DefaultFinder(); } - protected static void scanFolder(File javasFolder, List result) { - @SuppressWarnings("RedundantCast") File[] candidates = javasFolder.listFiles((FileFilter)JdkUtil::checkForJdk); + protected static void scanFolder(File folder, List result) { + if (JdkUtil.checkForJdk(folder)) + result.add(folder.getAbsolutePath()); + @SuppressWarnings("RedundantCast") File[] candidates = folder.listFiles((FileFilter)JdkUtil::checkForJdk); if (candidates != null) { for (File file : candidates) { result.add(file.getAbsolutePath());