You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2026/08/30 09:52:00 UTC

(maven) branch maven-4.0.x updated: Fix: make ProjectIndex thread-safe for parallel builds (backport #12832) (#12926)

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch maven-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-4.0.x by this push:
     new a4fcc6e75f Fix: make ProjectIndex thread-safe for parallel builds (backport #12832) (#12926)
a4fcc6e75f is described below

commit a4fcc6e75fdfd7bac8d2270a374e6f21633a6c40
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Sun Aug 30 11:51:54 2026 +0200

    Fix: make ProjectIndex thread-safe for parallel builds (backport #12832) (#12926)
    
    Backport of #12832 to maven-4.0.x: make ProjectIndex thread-safe for parallel builds by using ConcurrentHashMap and adding null guards in MojoExecutor.
---
 .../apache/maven/lifecycle/internal/MojoExecutor.java  | 18 +++++++++++++++---
 .../apache/maven/lifecycle/internal/ProjectIndex.java  |  6 +++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
index a3a761119c..bc7e55c1bb 100644
--- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
+++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
@@ -438,15 +438,27 @@ public List<MavenProject> executeForkedExecutions(MojoExecution mojoExecution, M
                             .getData()
                             .computeIfAbsent(PROJECT_INDEX, () -> new ProjectIndex(session.getProjects()));
 
-                    Integer index = projectIndex.getIndices().get(projectId);
-                    if (index == null) {
+                    Integer idx = projectIndex.getIndices().get(projectId);
+                    if (idx == null) {
                         throw new LifecycleExecutionException(
-                                "Forked execution references project '" + projectId + "' which is not in the reactor",
+                                "Forked execution references project '" + projectId
+                                        + "' which is not in the reactor. This can happen with parallel builds"
+                                        + " (-T) or when extensions modify the session projects.",
                                 mojoExecution,
                                 project);
                     }
+                    int index = idx;
 
                     MavenProject forkedProject = projectIndex.getProjects().get(projectId);
+                    if (forkedProject == null) {
+                        throw new LifecycleExecutionException(
+                                "Forked execution references project '" + projectId
+                                        + "' which is not in the reactor (no project instance). This can happen"
+                                        + " with parallel builds (-T) or when extensions modify the session"
+                                        + " projects.",
+                                mojoExecution,
+                                project);
+                    }
 
                     forkedProjects.add(forkedProject);
 
diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java
index 8799cb2fb9..6154ce0b8f 100644
--- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java
+++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ProjectIndex.java
@@ -18,9 +18,9 @@
  */
 package org.apache.maven.lifecycle.internal;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.maven.lifecycle.internal.builder.BuilderCommon;
 import org.apache.maven.project.MavenProject;
@@ -41,8 +41,8 @@ public final class ProjectIndex {
     private final Map<String, Integer> indices;
 
     public ProjectIndex(List<MavenProject> projects) {
-        this.projects = new HashMap<>(projects.size() * 2);
-        this.indices = new HashMap<>(projects.size() * 2);
+        this.projects = new ConcurrentHashMap<>(projects.size() * 2);
+        this.indices = new ConcurrentHashMap<>(projects.size() * 2);
 
         for (int i = 0; i < projects.size(); i++) {
             MavenProject project = projects.get(i);