Synchronize all access to libertyModules

Signed-off-by: Paul Gooderham <[email protected]>
OpenLiberty · Jan 13, 2025 · f3f8f2d · f3f8f2d
1 parent 75d3bf7
commit f3f8f2d
Showing 1 changed file with 24 additions and 16 deletions.
diff --git a/src/main/java/io/openliberty/tools/intellij/LibertyModules.java b/src/main/java/io/openliberty/tools/intellij/LibertyModules.java
@@ -45,19 +45,21 @@ public synchronized static LibertyModules getInstance() {
      * @param module LibertyModule
      */
     public LibertyModule addLibertyModule(LibertyModule module) {
-        if (libertyModules.containsKey(module.getBuildFile())) {
-            // Update existing Liberty project, projectType module, name and validContainerVersion
-            // Do not update the build file (key), debugMode, shellWidget or customStartParams since
-            // they may modify saved run configs.
-            LibertyModule existing = libertyModules.get(module.getBuildFile());
-            existing.setProject(module.getProject());
-            existing.setProjectType(module.getProjectType());
-            existing.setName(module.getName());
-            existing.setValidContainerVersion(module.isValidContainerVersion());
-        } else {
-            libertyModules.put(module.getBuildFile(), module);
+        synchronized(libertyModules) {
+            if (libertyModules.containsKey(module.getBuildFile())) {
+                // Update existing Liberty project, projectType module, name and validContainerVersion
+                // Do not update the build file (key), debugMode, shellWidget or customStartParams since
+                // they may modify saved run configs.
+                LibertyModule existing = libertyModules.get(module.getBuildFile());
+                existing.setProject(module.getProject());
+                existing.setProjectType(module.getProjectType());
+                existing.setName(module.getName());
+                existing.setValidContainerVersion(module.isValidContainerVersion());
+            } else {
+                libertyModules.put(module.getBuildFile(), module);
+            }
+            return libertyModules.get(module.getBuildFile());
         }
-        return libertyModules.get(module.getBuildFile());
     }
 
     /**
@@ -67,7 +69,9 @@ public LibertyModule addLibertyModule(LibertyModule module) {
      * @return LibertyModule
      */
     public LibertyModule getLibertyModule(VirtualFile buildFile) {
-        return libertyModules.get(buildFile);
+        synchronized(libertyModules) {
+            return libertyModules.get(buildFile);
+        }
     }
 
     /**
@@ -77,8 +81,10 @@ public LibertyModule getLibertyModule(VirtualFile buildFile) {
      * @return LibertyModule
      */
     public LibertyModule getLibertyProjectFromString(String buildFile) {
-        VirtualFile vBuildFile = VfsUtil.findFile(Paths.get(buildFile), true);
-        return libertyModules.get(vBuildFile);
+        synchronized(libertyModules) {
+            VirtualFile vBuildFile = VfsUtil.findFile(Paths.get(buildFile), true);
+            return libertyModules.get(vBuildFile);
+        }
     }
 
     /**
@@ -127,7 +133,9 @@ public List<LibertyModule> getLibertyModules(Project project, List<String> proje
      * @param libertyModule
      */
     public void removeLibertyModule(LibertyModule libertyModule) {
-        libertyModules.remove(libertyModule.getBuildFile());
+        synchronized(libertyModules) {
+            libertyModules.remove(libertyModule.getBuildFile());
+        }
     }
 
     /**