From b18b2e686db5a790d2e5b62313c9e0983d076883 Mon Sep 17 00:00:00 2001
From: Devin Nusbaum <dwnusbaum@users.noreply.github.com>
Date: Thu, 13 Jun 2019 16:27:38 -0400
Subject: [PATCH] [JENKINS-57725] - Wrap Proc.executor in
 ClassLoaderSanityThreadFactory (#4035)

---
 core/src/main/java/hudson/Proc.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/hudson/Proc.java b/core/src/main/java/hudson/Proc.java
index e7e4841403..6acb1ceeba 100644
--- a/core/src/main/java/hudson/Proc.java
+++ b/core/src/main/java/hudson/Proc.java
@@ -26,6 +26,7 @@ package hudson;
 import hudson.Launcher.ProcStarter;
 import hudson.model.TaskListener;
 import hudson.remoting.Channel;
+import hudson.util.ClassLoaderSanityThreadFactory;
 import hudson.util.DaemonThreadFactory;
 import hudson.util.ExceptionCatchingThreadFactory;
 import hudson.util.NamingThreadFactory;
@@ -138,7 +139,7 @@ public abstract class Proc {
     @CheckForNull
     public abstract OutputStream getStdin();
 
-    private static final ExecutorService executor = Executors.newCachedThreadPool(new ExceptionCatchingThreadFactory(new NamingThreadFactory(new DaemonThreadFactory(), "Proc.executor")));
+    private static final ExecutorService executor = Executors.newCachedThreadPool(new ExceptionCatchingThreadFactory(new NamingThreadFactory(new ClassLoaderSanityThreadFactory(new DaemonThreadFactory()), "Proc.executor")));
     
     /**
      * Like {@link #join} but can be given a maximum time to wait.