[JENKINS-16845] Diagnostics.

jenkinsci · Apr 3, 2013 · e172407 · e172407
1 parent 750da1a
commit e172407
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -213,7 +213,11 @@ public R getPreviousBuild() {
 
             if (r==null) {
                 // having two neighbors pointing to each other is important to make RunMap.removeValue work
-                R pb = getParent().builds.search(number-1, Direction.DESC);
+                P _parent = getParent();
+                if (_parent == null) {
+                    throw new IllegalStateException("no parent for " + this);
+                }
+                R pb = _parent._getRuns().search(number-1, Direction.DESC);
                 if (pb!=null) {
                     ((AbstractBuild)pb).nextBuild = selfReference;   // establish bi-di link
                     this.previousBuild = pb.selfReference;

diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
@@ -1010,6 +1010,9 @@ public BuildAuthorizationToken getAuthToken() {
 
     @Override
     public RunMap<R> _getRuns() {
+        if (builds == null) {
+            throw new IllegalStateException("no run map created yet for " + this);
+        }
         assert builds.baseDirInitialized() : "neither onCreatedFromScratch nor onLoad called on " + this + " yet";
         return builds;
     }