[JENKINS-50407] Trying to diagnose an NPE.

jenkinsci · Mar 26, 2018 · 5d08569 · 5d08569
1 parent 7ac0d46
commit 5d08569
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuable.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/SandboxContinuable.java
@@ -2,6 +2,7 @@
 
 import com.cloudbees.groovy.cps.Continuable;
 import com.cloudbees.groovy.cps.Outcome;
+import groovy.lang.GroovyShell;
 import java.util.List;
 import org.jenkinsci.plugins.scriptsecurity.sandbox.RejectedAccessException;
 import org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.GroovySandbox;
@@ -29,19 +30,27 @@ class SandboxContinuable extends Continuable {
     public Outcome run0(final Outcome cn, final List<Class> categories) {
         try {
             CpsFlowExecution e = thread.group.getExecution();
-            return GroovySandbox.runInSandbox(new Callable<Outcome>() {
-                @Override
-                public Outcome call() {
+            if (e == null) {
+                throw new IllegalStateException("no loaded execution");
+            }
+            GroovyShell shell = e.getShell();
+            if (shell == null) {
+                throw new IllegalStateException("no loaded shell in " + e);
+            }
+            GroovyShell trustedShell = e.getTrustedShell();
+            if (trustedShell == null) {
+                throw new IllegalStateException("no loaded trustedShell in " + e);
+            }
+            return GroovySandbox.runInSandbox(() -> {
                     Outcome outcome = SandboxContinuable.super.run0(cn, categories);
                     RejectedAccessException x = findRejectedAccessException(outcome.getAbnormal());
                     if (x != null) {
                         ScriptApproval.get().accessRejected(x, ApprovalContext.create());
                     }
                     return outcome;
-                }
             }, new GroovyClassLoaderWhitelist(CpsWhitelist.get(),
-                    e.getTrustedShell().getClassLoader(),
-                    e.getShell().getClassLoader()));
+                    trustedShell.getClassLoader(),
+                    shell.getClassLoader()));
         } catch (RuntimeException e) {
             throw e;
         } catch (Exception e) {