Merge pull request #353 from monluk/bugfix/multijob_infinite_recursion

Bugfix for #255: Multijob infinite recursion when subordinate job is …
jenkinsci · Mar 25, 2024 · 7c23cef · 7c23cef
2 parents 3a1ef03 + 28cccb9
commit 7c23cef
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/main/java/com/tikal/jenkins/plugins/multijob/MultiJobBuilder.java b/src/main/java/com/tikal/jenkins/plugins/multijob/MultiJobBuilder.java
@@ -168,11 +168,9 @@ public String expandToken(String toExpand, final AbstractBuild<?,?> build, final
      */
     private StatusJob getScmChange(Job subjob,PhaseJobsConfig phaseConfig,AbstractBuild build, BuildListener listener,Launcher launcher)
     throws IOException, InterruptedException {
-        /* https://issues.jenkins-ci.org/browse/JENKINS-33821
-        if ( subjob.disabled ) {
+        if ( ! subjob.isBuildable() ) {
             return StatusJob.IS_DISABLED;
         }
-        */
         if( phaseConfig.isDisableJob() ) {
             return StatusJob.IS_DISABLED_AT_PHASECONFIG;
         }