[FIX JENKINS-41765] Allow groovy CLI command via SSH

jenkinsci · Feb 6, 2017 · 0d3d6b6 · 0d3d6b6
1 parent c4dcffa
commit 0d3d6b6
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/core/src/main/java/hudson/cli/GroovyCommand.java b/core/src/main/java/hudson/cli/GroovyCommand.java
@@ -71,14 +71,17 @@ protected int run() throws Exception {
         binding.setProperty("stdout",stdout);
         binding.setProperty("stderr",stderr);
         binding.setProperty("channel",channel);
-        String j = getClientEnvironmentVariable("JOB_NAME");
+
-        if (j!=null) {
+        if (channel != null) {
-            Item job = Jenkins.getActiveInstance().getItemByFullName(j);
+            String j = getClientEnvironmentVariable("JOB_NAME");
-            binding.setProperty("currentJob", job);
+            if (j != null) {
-            String b = getClientEnvironmentVariable("BUILD_NUMBER");
+                Item job = Jenkins.getActiveInstance().getItemByFullName(j);
-            if (b!=null && job instanceof AbstractProject) {
+                binding.setProperty("currentJob", job);
-                Run r = ((AbstractProject) job).getBuildByNumber(Integer.parseInt(b));
+                String b = getClientEnvironmentVariable("BUILD_NUMBER");
-                binding.setProperty("currentBuild", r);
+                if (b != null && job instanceof AbstractProject) {
+                    Run r = ((AbstractProject) job).getBuildByNumber(Integer.parseInt(b));
+                    binding.setProperty("currentBuild", r);
+                }
             }
         }