diff --git a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java index 14e3cb54c2..a0155b1c9b 100644 --- a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -55,21 +55,23 @@ public final class MavenModuleSetBuild extends AbstractBuild + * More precisely, this picks up the status of this build itself, + * plus all the latest builds of the modules that belongs to this build. */ @Override public Result getResult() { Result r = super.getResult(); - for (List list : getModuleBuilds().values()) - for (MavenBuild build : list) { - Result br = build.getResult(); - if(r==null) - r = br; - else - if(br!=null) - r = r.combine(br); - } + for (MavenBuild b : getModuleLastBuilds().values()) { + Result br = b.getResult(); + if(r==null) + r = br; + else + if(br!=null) + r = r.combine(br); + } return r; } @@ -103,6 +105,28 @@ public final class MavenModuleSetBuild extends AbstractBuild getModuleLastBuilds() { + Collection mods = getParent().getModules(); + + // identify the build number range. [start,end) + MavenModuleSetBuild nb = getNextBuild(); + int end = nb!=null ? nb.getNumber() : Integer.MAX_VALUE; + + // preserve the order by using LinkedHashMap + Map r = new LinkedHashMap(mods.size()); + + for (MavenModule m : mods) { + MavenBuild b = m.getNearestOldBuild(end - 1); + if(b.getNumber()>=getNumber()) + r.put(m,b); + } + + return r; + } + /** * Finds {@link Action}s from all the module builds that belong to this * {@link MavenModuleSetBuild}. One action per one {@link MavenModule},