From 28cccb9883484974f27abb0ebd27e047aa7a1621 Mon Sep 17 00:00:00 2001
From: Monika Lukow <monika.lukow@gmail.com>
Date: Sun, 24 Mar 2024 21:56:18 +0100
Subject: [PATCH] Bugfix for #255: Multijob infinite recursion when subordinate
 job is disabled

---
 .../com/tikal/jenkins/plugins/multijob/MultiJobBuilder.java   | 4 +---
 1 file changed, 1 insertion(+), 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
index d0e64aeb..4182d730 100644
--- 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;
         }