apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-11 21:50:38 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix getCurrentProject, #fixes #262

Browse Source
This commit is contained in:
Guillaume Nodet
2020-12-15 07:56:00 +01:00
parent 6c12c9835b
commit c19d26dc50
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
View File

@@ -42,6 +42,7 @@ import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.maven.cli.DaemonMavenCli; import org.apache.maven.cli.DaemonMavenCli;
import org.apache.maven.execution.MavenSession; import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.mvndaemon.mvnd.builder.SmartBuilder; import org.mvndaemon.mvnd.builder.SmartBuilder;
import org.mvndaemon.mvnd.common.DaemonConnection; import org.mvndaemon.mvnd.common.DaemonConnection;
import org.mvndaemon.mvnd.common.DaemonException; import org.mvndaemon.mvnd.common.DaemonException;
@@ -651,10 +652,22 @@ public class Server implements AutoCloseable, Runnable {
@Override @Override
protected void onStartSession(MavenSession session) { protected void onStartSession(MavenSession session) {
queue.add(new BuildStarted(session.getCurrentProject().getName(), session.getProjects().size(), queue.add(new BuildStarted(getCurrentProject(session).getName(), session.getProjects().size(),
session.getRequest().getDegreeOfConcurrency())); session.getRequest().getDegreeOfConcurrency()));
} }
private MavenProject getCurrentProject(MavenSession mavenSession) {
// MavenSession.getCurrentProject() does not return the correct value in some cases
String executionRootDirectory = mavenSession.getExecutionRootDirectory();
if (executionRootDirectory == null) {
return mavenSession.getCurrentProject();
}
return mavenSession.getProjects().stream()
.filter(p -> (p.getFile() != null && executionRootDirectory.equals(p.getFile().getParent())))
.findFirst()
.orElse(mavenSession.getCurrentProject());
}
@Override @Override
protected void onStartProject(String projectId, String display) { protected void onStartProject(String projectId, String display) {
queue.add(Message.projectStarted(projectId, display)); queue.add(Message.projectStarted(projectId, display));