From 1dd5523f7702bb12bf062d621bb994f339ff4709 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 29 Jan 2020 16:53:44 +0100 Subject: [PATCH] [platform] another NPE on detecting a name of a project located in a Windows disk root GitOrigin-RevId: 2ef104eb03cb95d985a77685c2fdce2e59572084 --- jps/model-api/src/org/jetbrains/jps/util/JpsPathUtil.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jps/model-api/src/org/jetbrains/jps/util/JpsPathUtil.java b/jps/model-api/src/org/jetbrains/jps/util/JpsPathUtil.java index fa425f1187e1..b5b25dabe1be 100644 --- a/jps/model-api/src/org/jetbrains/jps/util/JpsPathUtil.java +++ b/jps/model-api/src/org/jetbrains/jps/util/JpsPathUtil.java @@ -99,6 +99,12 @@ public class JpsPathUtil { public static @NotNull String getDefaultProjectName(@NotNull Path projectDir) { Path parent = projectDir.getParent(); - return parent != null ? parent.getFileName().toString() : UNNAMED_PROJECT; + if (parent != null) { + Path name = parent.getFileName(); // `null` when parent is a Windows disk root + return name != null ? name.toString() : parent.toString(); + } + else { + return UNNAMED_PROJECT; + } } } \ No newline at end of file