devonfw#754: quickfix via lazy init

hohwille · Nov 12, 2024 · 7613a7a · 7613a7a
1 parent 2b473ff
commit 7613a7a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java b/cli/src/main/java/com/devonfw/tools/ide/context/AbstractIdeContext.java
@@ -247,10 +247,8 @@ public void setCwd(Path userDir, String workspace, Path ideHome) {
     this.userHomeIde = this.userHome.resolve(".ide");
     this.downloadPath = this.userHome.resolve("Downloads/ide");
 
-    this.variables = createVariables();
     this.path = computeSystemPath();
     this.customToolRepository = CustomToolRepositoryImpl.of(this);
-    this.workspaceMerger = new DirectoryMerger(this);
   }
 
   private String getMessageIdeHomeFound() {
@@ -498,6 +496,9 @@ public SystemPath getPath() {
   @Override
   public EnvironmentVariables getVariables() {
 
+    if (this.variables == null) {
+      this.variables = createVariables();
+    }
     return this.variables;
   }
 
@@ -571,6 +572,9 @@ public Locale getLocale() {
   @Override
   public DirectoryMerger getWorkspaceMerger() {
 
+    if (this.workspaceMerger == null) {
+      this.workspaceMerger = new DirectoryMerger(this);
+    }
     return this.workspaceMerger;
   }
 
@@ -1054,6 +1058,6 @@ public IdeStartContextImpl getStartContext() {
    * Reloads this context and re-initializes the {@link #getVariables() variables}.
    */
   public void reload() {
-    this.variables = createVariables();
+    this.variables = null;
   }
 }