[JENKINS-34900] getRootBuild() returns itself when there's no parent. (…

…#68)
jenkinsci · Aug 26, 2016 · aacdd9d · aacdd9d
1 parent d2554dd
commit aacdd9d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/hudson/maven/MavenBuild.java b/src/main/java/hudson/maven/MavenBuild.java
@@ -176,11 +176,12 @@ public String getDisplayName() {
     }
 
     /**
-     * The same as {@link #getParentBuild()}.
+     * The same as {@link #getParentBuild()} except that returns itself when no parent.
      */
     @Override
     public AbstractBuild<?, ?> getRootBuild() {
-        return getParentBuild();
+        AbstractBuild<?, ?> parent = getParentBuild();
+        return (parent != null) ? parent : this;
     }
 
     /**

diff --git a/src/test/java/hudson/maven/AbstractMaven3xBuildTest.java b/src/test/java/hudson/maven/AbstractMaven3xBuildTest.java
@@ -278,6 +278,11 @@ public void testSingleModuleBuild() throws Exception {
         for(MavenModule module : expectedNonBuiltModules) {
             assertEquals(1,module.getLastBuild().getNumber());
         }
+
+        // AbstractBuild#getRootBuild() never be null.
+        assertNotNull(isolated.getRootBuild());
+        // as there's no parent build, rootBuild is itself.
+        assertEquals(isolated, isolated.getRootBuild());
     }
 
     @Bug(12109)