JENKINS-62006 Fix a classloading issue while executing ProcessTree.ge…

…t() (#5367) * JENKINS-62006 Check if agent before master, fix remoting classloading error * Use JenkinsJVM API
jenkinsci · Mar 22, 2021 · e2837f8 · e2837f8
1 parent 43dbc8f
commit e2837f8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/java/jenkins/agents/AgentComputerUtil.java b/core/src/main/java/jenkins/agents/AgentComputerUtil.java
@@ -28,7 +28,7 @@
 import hudson.FilePath;
 import hudson.remoting.Channel;
 import hudson.remoting.VirtualChannel;
-import jenkins.model.Jenkins;
+import jenkins.util.JenkinsJVM;
 
 public final class AgentComputerUtil {
     private AgentComputerUtil() {
@@ -45,7 +45,7 @@ private AgentComputerUtil() {
      */
     @CheckForNull
     public static VirtualChannel getChannelToMaster() {
-        if (Jenkins.getInstanceOrNull() != null) {// check if calling thread is on master or on agent
+        if (JenkinsJVM.isJenkinsJVM()) {
             return FilePath.localChannel;
         }