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