Merge branch 'master' into Timing.close

Author: jglick

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.4</version>
+    <version>1.6</version>
   </extension>
 </extensions>

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java

@@ -561,13 +561,19 @@ private Env createInitialEnv() {
 
     private CpsScript parseScript() throws IOException {
         // classloader hierarchy. See doc/classloader.md
-        trusted = new CpsGroovyShellFactory(this).forTrusted().build();
-        shell = new CpsGroovyShellFactory(this).withParent(trusted).build();
+        CpsScript s;
+        try {
+            trusted = new CpsGroovyShellFactory(this).forTrusted().build();
+            shell = new CpsGroovyShellFactory(this).withParent(trusted).build();
 
-        CpsScript s = (CpsScript) shell.reparse("WorkflowScript",script);
+            s = (CpsScript) shell.reparse("WorkflowScript",script);
 
-        for (Entry<String, String> e : loadedScripts.entrySet()) {
-            shell.reparse(e.getKey(), e.getValue());
+            for (Entry<String, String> e : loadedScripts.entrySet()) {
+                shell.reparse(e.getKey(), e.getValue());
+            }
+        } catch (RuntimeException | Error x) {
+            closeShells();
+            throw x;
         }
 
         s.execution = this;
@@ -1308,10 +1314,26 @@ synchronized void onProgramEnd(Outcome outcome) {
         this.persistedClean = Boolean.TRUE;
     }
 
+    private void closeShells() {
+        try {
+            if (shell != null) {
+                LOGGER.fine(() -> "closing main class loader from " + owner);
+                shell.getClassLoader().close();
+                shell = null;
+            }
+            if (trusted != null) {
+                LOGGER.fine(() -> "closing trusted class loader from " + owner);
+                trusted.getClassLoader().close();
+                trusted = null;
+            }
+        } catch (IOException x) {
+            LOGGER.log(Level.WARNING, "failed to close class loaders from " + owner, x);
+        }
+    }
+
     void cleanUpHeap() {
         LOGGER.log(Level.FINE, "cleanUpHeap on {0}", owner);
-        shell = null;
-        trusted = null;
+        closeShells();
         if (scriptClass != null) {
             try {
                 cleanUpLoader(scriptClass.getClassLoader(), new HashSet<>(), new HashSet<>());