devonfw#1065: fix NPE on upgrade (maven repo access) (devonfw#1072)

Co-authored-by: jan-vcapgemini <[email protected]>
julia-cap · Feb 28, 2025 · 54b2a82 · 54b2a82
1 parent 8f3c98e
commit 54b2a82
Showing 1 changed file with 12 additions and 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
@@ -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;
   }
 
   /**