SLI-1816 Interrupting the branch matching should not cause an error

SonarSource · Jan 29, 2025 · 63ff89d · 63ff89d
1 parent 5e24821
commit 63ff89d
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/main/java/org/sonarlint/intellij/SonarLintIntelliJClient.kt b/src/main/java/org/sonarlint/intellij/SonarLintIntelliJClient.kt
@@ -648,7 +648,14 @@ object SonarLintIntelliJClient : SonarLintRpcClientDelegate {
                 resultFuture.complete(result)
             }
         })
-        return computeOnPooledThread(project, "Waiting for branch matching result") { resultFuture.get() }
+        return computeOnPooledThread(project, "Waiting for branch matching result") {
+            try {
+                resultFuture.get()
+            } catch (e: InterruptedException) {
+                getService(project, SonarLintConsole::class.java).error("Interrupted while waiting for branch matching result", e)
+                null
+            }
+        }
     }
 
     override fun matchProjectBranch(