From 54b2a823745939ab397b66cd78271c286d4eb6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= Date: Wed, 26 Feb 2025 18:50:09 +0100 Subject: [PATCH] #1065: fix NPE on upgrade (maven repo access) (#1072) Co-authored-by: jan-vcapgemini <59438728+jan-vcapgemini@users.noreply.github.com> --- .../devonfw/tools/ide/context/IdeContext.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/context/IdeContext.java b/cli/src/main/java/com/devonfw/tools/ide/context/IdeContext.java index bacf693ec..bf89288ff 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/context/IdeContext.java +++ b/cli/src/main/java/com/devonfw/tools/ide/context/IdeContext.java @@ -609,21 +609,24 @@ default String getMavenArgs() { */ default Path getMavenConfigurationFolder() { - if (getIdeHome() != null) { - Path confPath = getConfPath(); - Path m2Folder = confPath.resolve(Mvn.MVN_CONFIG_FOLDER); - if (!Files.isDirectory(m2Folder)) { + Path confPath = getConfPath(); + Path mvnConfFolder = null; + if (confPath != null) { + mvnConfFolder = confPath.resolve(Mvn.MVN_CONFIG_FOLDER); + if (!Files.isDirectory(mvnConfFolder)) { Path m2LegacyFolder = confPath.resolve(Mvn.MVN_CONFIG_LEGACY_FOLDER); if (Files.isDirectory(m2LegacyFolder)) { - m2Folder = m2LegacyFolder; + mvnConfFolder = m2LegacyFolder; } else { - // fallback to USER_HOME/.m2 folder - m2Folder = getUserHome().resolve(Mvn.MVN_CONFIG_LEGACY_FOLDER); + mvnConfFolder = null; // see fallback below } } - return m2Folder; } - return null; + if (mvnConfFolder == null) { + // fallback to USER_HOME/.m2 folder + mvnConfFolder = getUserHome().resolve(Mvn.MVN_CONFIG_LEGACY_FOLDER); + } + return mvnConfFolder; } /**