From 09c7cf6ad7cfb4d88d6d8936f29b13f3ca187875 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 21 Feb 2013 15:19:19 -0500 Subject: [PATCH] [JENKINS-15156] Found a problem with uninitialized run maps in new Maven modules. Not observed in actual usage, but reproducible (for me at least, though apparently not ci.jenkins-ci.org) in a test: java.lang.AssertionError: null at jenkins.model.lazy.AbstractLazyLoadRunMap.load(AbstractLazyLoadRunMap.java:628) at jenkins.model.lazy.AbstractLazyLoadRunMap.all(AbstractLazyLoadRunMap.java:581) at jenkins.model.lazy.AbstractLazyLoadRunMap.entrySet(AbstractLazyLoadRunMap.java:243) at java.util.AbstractMap$2$1.(AbstractMap.java:378) at java.util.AbstractMap$2.iterator(AbstractMap.java:377) at hudson.util.RunList.iterator(RunList.java:103) at hudson.util.RunList.size(RunList.java:114) at hudson.maven.MavenProjectTest.testDeleteSetBuildDeletesModuleBuilds(MavenProjectTest.java:159) --- core/src/main/java/hudson/model/AbstractProject.java | 2 +- .../jenkins/model/lazy/AbstractLazyLoadRunMap.java | 11 +++++++++++ .../main/java/hudson/maven/MavenModuleSetBuild.java | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index d1e965454b..5fcaa7eb98 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -88,7 +88,6 @@ import jenkins.scm.SCMCheckoutStrategy; import jenkins.scm.SCMCheckoutStrategyDescriptor; import jenkins.util.TimeDuration; import net.sf.json.JSONObject; -import org.apache.tools.ant.taskdefs.email.Mailer; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.args4j.Argument; @@ -989,6 +988,7 @@ public abstract class AbstractProject

,R extends A @Override public RunMap _getRuns() { + assert builds.baseDirInitialized() : "neither onCreatedFromScratch nor onLoad called on " + this + " yet"; return builds; } diff --git a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java index 5517891e19..dd0c3ca586 100644 --- a/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java +++ b/core/src/main/java/jenkins/model/lazy/AbstractLazyLoadRunMap.java @@ -23,7 +23,9 @@ */ package jenkins.model.lazy; +import hudson.model.Job; import hudson.model.Run; +import hudson.model.RunMap; import org.apache.commons.collections.keyvalue.DefaultMapEntry; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; @@ -200,6 +202,14 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i loadIdOnDisk(); } + /** + * @return true if {@link AbstractLazyLoadRunMap#AbstractLazyLoadRunMap} was called with a non-null param, or {@link RunMap#load(Job, RunMap.Constructor)} was called + */ + @Restricted(NoExternalUse.class) + public final boolean baseDirInitialized() { + return dir != null; + } + private void loadIdOnDisk() { String[] buildDirs = dir.list(createDirectoryFilter()); if (buildDirs==null) { @@ -240,6 +250,7 @@ public abstract class AbstractLazyLoadRunMap extends AbstractMap i @Override public Set> entrySet() { + assert baseDirInitialized(); return Collections.unmodifiableSet(new BuildReferenceMapAdapter(this,all()).entrySet()); } diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 0f8c9eedbf..6d5b93ee26 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -905,6 +905,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild