From 9ebdffab0b60e7edf208d84ec32d4f997b2bc628 Mon Sep 17 00:00:00 2001
From: Alexander Bubenchikov <alexander.bubenchikov@jetbrains.com>
Date: Thu, 19 Sep 2024 18:08:16 +0200
Subject: [PATCH] [maven] fix flaky tests IDEA-357354

GitOrigin-RevId: 3389ea7b60f9bfa95f59bb8da03be0614e3f3ba4
---
 .../m40/utils/Maven40ProjectResolver.java     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/plugins/maven/maven40-server-impl/src/com/intellij/maven/server/m40/utils/Maven40ProjectResolver.java b/plugins/maven/maven40-server-impl/src/com/intellij/maven/server/m40/utils/Maven40ProjectResolver.java
index ea4b06c013e3..fbd4d2d153de 100644
--- a/plugins/maven/maven40-server-impl/src/com/intellij/maven/server/m40/utils/Maven40ProjectResolver.java
+++ b/plugins/maven/maven40-server-impl/src/com/intellij/maven/server/m40/utils/Maven40ProjectResolver.java
@@ -173,23 +173,23 @@ public class Maven40ProjectResolver {
         buildingResultInfos.add(new ProjectBuildingResultInfo(buildingResult, exceptions, newDependencyHash));
 
         myLongRunningTask.updateTotalRequests(buildingResultInfos.size());
-
-        Collection<Maven40ExecutionResult> execResults =
-          myTelemetry.executeWithSpan("resolveBuildingResults",
-                                      runInParallel,
-                                      buildingResultInfos, br -> {
-              if (myLongRunningTask.isCanceled()) return new Maven40ExecutionResult(Collections.emptyList());
-              Maven40ExecutionResult result = myTelemetry.callWithSpan(
-                "resolveBuildingResult " + br.buildingResult.getProjectId(), () ->
-                  resolveBuildingResult(session.getRepositorySession(), br.buildingResult, br.exceptions));
-              result.setDependencyHash(br.dependencyHash);
-              myLongRunningTask.incrementFinishedRequests();
-              return result;
-            }
-          );
-
-        executionResults.addAll(execResults);
       }
+
+      Collection<Maven40ExecutionResult> execResults =
+        myTelemetry.executeWithSpan("resolveBuildingResults",
+                                    runInParallel,
+                                    buildingResultInfos, br -> {
+            if (myLongRunningTask.isCanceled()) return new Maven40ExecutionResult(Collections.emptyList());
+            Maven40ExecutionResult result = myTelemetry.callWithSpan(
+              "resolveBuildingResult " + br.buildingResult.getProjectId(), () ->
+                resolveBuildingResult(session.getRepositorySession(), br.buildingResult, br.exceptions));
+            result.setDependencyHash(br.dependencyHash);
+            myLongRunningTask.incrementFinishedRequests();
+            return result;
+          }
+        );
+
+      executionResults.addAll(execResults);
     }
     catch (Exception e) {
       executionResults.add(handleException(e));