fix: reduced span of ReadAction to avoid possible deadlock (#944) (#962)

Signed-off-by: Andre Dietisheim <[email protected]>
redhat-developer · Jan 31, 2025 · fbac285 · fbac285
1 parent 2474d44
commit fbac285
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/org/jboss/tools/intellij/openshift/tree/application/ApplicationsRootNode.java b/src/main/java/org/jboss/tools/intellij/openshift/tree/application/ApplicationsRootNode.java
@@ -93,13 +93,13 @@ public void setLogged(boolean logged) {
   private CompletableFuture<ApplicationRootNodeOdo> doGetOdo() {
     if (odoFuture == null) {
       this.odoFuture =
-        ReadAction.compute(() -> ToolFactory.getInstance()
+        ToolFactory.getInstance()
           .createOdo(getClient(), project)
           .thenApply(tool -> {
             ApplicationRootNodeOdo odo = new ApplicationRootNodeOdo(tool.get(), tool.isDownloaded(), this, processHelper);
             loadProjectModel(odo, project);
             return odo;
-          }));
+          });
     }
     return odoFuture;
   }
@@ -175,9 +175,11 @@ protected void loadProjectModel(OdoFacade odo, Project project) {
     if (odo == null) {
       return;
     }
-    for (Module module : ModuleManager.getInstance(project).getModules()) {
-      addContext(odo, ProjectUtils.getModuleRoot(module));
-    }
+    ReadAction.run(() -> {
+      for (Module module : ModuleManager.getInstance(project).getModules()) {
+        addContext(odo, ProjectUtils.getModuleRoot(module));
+      }
+    });
   }
 
   @Override