Tolerate RuntimeException from SCMListener.onCheckout

jenkinsci · May 6, 2021 · 3f97531 · 3f97531
1 parent 2336bd3
commit 3f97531
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/steps/scm/SCMStep.java b/src/main/java/org/jenkinsci/plugins/workflow/steps/scm/SCMStep.java
@@ -39,6 +39,8 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.annotation.Nonnull;
 import org.jenkinsci.plugins.workflow.steps.Step;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
@@ -52,6 +54,8 @@
  */
 public abstract class SCMStep extends Step {
 
+    private static final Logger LOGGER = Logger.getLogger(SCMStep.class.getName());
+
     private boolean poll = true;
     private boolean changelog = true;
 
@@ -147,7 +151,11 @@ public final void checkout(Run<?,?> run, FilePath workspace, TaskListener listen
                 }
             }
             for (SCMListener l : SCMListener.all()) {
-                l.onCheckout(run, scm, workspace, listener, changelogFile, pollingBaseline);
+                try {
+                    l.onCheckout(run, scm, workspace, listener, changelogFile, pollingBaseline);
+                } catch (RuntimeException x) {
+                    LOGGER.log(Level.WARNING, null, x);
+                }
             }
             scm.postCheckout(run, launcher, workspace, listener);
         } catch (Exception e) {