From 28725f66397c60dca1b902bf4ec7da64b8aba88c Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Sun, 19 Jul 2020 01:45:19 +0200 Subject: [PATCH] fix NPE GitOrigin-RevId: 7d80460b3a93df0d05601336bb96650d4bdef15a --- .../openapi/projectRoots/impl/JavaHomeFinderMac.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinderMac.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinderMac.java index 3973da02dc02..5229f192579f 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinderMac.java +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinderMac.java @@ -51,12 +51,14 @@ final class JavaHomeFinderMac extends JavaHomeFinderBasic { List result = new ArrayList<>(); result.add(file); - if (file.getFileName().toString().equalsIgnoreCase("Home")) { + Path home = file.getFileName(); + if (home != null && home.toString().equalsIgnoreCase("Home")) { Path parentFile = file.getParent(); if (parentFile != null) { result.add(parentFile); - if (parentFile.getFileName().toString().equalsIgnoreCase("Contents")) { + Path contents = parentFile.getFileName(); + if (contents != null && contents.toString().equalsIgnoreCase("Contents")) { Path parentParentFile = parentFile.getParent(); if (parentParentFile != null) { result.add(parentParentFile);