fixed a bug where a scheduled next build number is not correct for maven module set.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@2190 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2007-02-12 14:27:51 +00:00
1 parent d30e2ab9b1
commit 6609f3d2e1
3 files changed
+23 -7

No files matched your search

@@ -150,10 +150,6 @@ public final class MavenModule extends AbstractProject<MavenModule,MavenBuild> i
return (MavenModuleSet)super.getParent();
}
/*package*/ int peekNextBuildNumber() {
return nextBuildNumber;
}
/*package*/ void updateNextBuildNumber(int next) throws IOException {
if(next>nextBuildNumber) {
this.nextBuildNumber = next;
@@ -27,6 +27,8 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
import java.util.logging.Level;
/**
* Group of {@link MavenModule}s.
@@ -175,9 +177,24 @@ public final class MavenModuleSet extends AbstractProject<MavenModuleSet,MavenMo
*/
public synchronized int assignBuildNumber() throws IOException {
// determine the next value
updateNextBuildNumber();
return super.assignBuildNumber();
}
public synchronized int getNextBuildNumber() {
try {
updateNextBuildNumber();
} catch (IOException e) {
LOGGER.log(Level.SEVERE,"Failed to save the next build number",e);
}
return nextBuildNumber;
}
private void updateNextBuildNumber() throws IOException {
int next = this.nextBuildNumber;
for (MavenModule m : modules.values())
next = Math.max(next,m.peekNextBuildNumber());
next = Math.max(next,m.getNextBuildNumber());
if(this.nextBuildNumber!=next) {
this.nextBuildNumber=next;
@@ -186,8 +203,6 @@ public final class MavenModuleSet extends AbstractProject<MavenModuleSet,MavenMo
for (MavenModule m : modules.values())
m.updateNextBuildNumber(next);
return super.assignBuildNumber();
}
protected void buildDependencyGraph(DependencyGraph graph) {
@@ -295,4 +310,6 @@ public final class MavenModuleSet extends AbstractProject<MavenModuleSet,MavenMo
return new MavenModuleSet(name);
}
}
private static final Logger LOGGER = Logger.getLogger(MavenModuleSet.class.getName());
}
+3
View File
@@ -134,6 +134,9 @@ public abstract class Job<JobT extends Job<JobT,RunT>, RunT extends Run<JobT,Run
return r;
}
/**
* Peeks the next build number.
*/
public int getNextBuildNumber() {
return nextBuildNumber;
}