[highsource#188] Classloaders not being closed for mojo classloader

laurentschoelens · Aug 29, 2023 · efd58cc · efd58cc
1 parent b148894
commit efd58cc
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 21 deletions.
diff --git a/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/RawXJC2Mojo.java
@@ -20,6 +20,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.URLClassLoader;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -305,26 +306,26 @@ public List<URI> getProducesURIs() {
 	 */
 	public void execute() throws MojoExecutionException {
 		synchronized (lock) {
-			injectDependencyDefaults();
-			resolveArtifacts();
-
-			// Install project dependencies into classloader's class path
-			// and execute xjc2.
-			final ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
-			final ClassLoader classLoader = createClassLoader(currentClassLoader);
-			Thread.currentThread().setContextClassLoader(classLoader);
-			final Locale currentDefaultLocale = Locale.getDefault();
-			try {
-				final Locale locale = LocaleUtils.valueOf(getLocale());
-				Locale.setDefault(locale);
-				//
-				doExecute();
-
-			} finally {
-				Locale.setDefault(currentDefaultLocale);
-				// Set back the old classloader
-				Thread.currentThread().setContextClassLoader(currentClassLoader);
-			}
+            injectDependencyDefaults();
+            resolveArtifacts();
+
+            // Install project dependencies into classloader's class path and execute xjc2.
+            final ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
+            final Locale currentDefaultLocale = Locale.getDefault();
+            URLClassLoader classLoader = null;
+            try {
+                classLoader = createClassLoader(currentClassLoader);
+                Thread.currentThread().setContextClassLoader(classLoader);
+                final Locale locale = LocaleUtils.valueOf(getLocale());
+                Locale.setDefault(locale);
+                //
+                doExecute();
+            } finally {
+                Locale.setDefault(currentDefaultLocale);
+                // Set back the old classloader
+                Thread.currentThread().setContextClassLoader(currentClassLoader);
+                IOUtils.close(classLoader);
+            }
 		}
 	}
 
@@ -416,7 +417,7 @@ protected void resolveEpisodeArtifacts()
 		this.episodeFiles = ArtifactUtils.getFiles(this.episodeArtifacts);
 	}
 
-	protected ClassLoader createClassLoader(ClassLoader parent) {
+	protected URLClassLoader createClassLoader(ClassLoader parent) {
 
 		final Collection<URL> xjcPluginURLs = getXjcPluginURLs();
 

diff --git a/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/IOUtils.java b/maven-plugin/plugin-core/src/main/java/org/jvnet/jaxb/maven/util/IOUtils.java
@@ -5,6 +5,7 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -187,4 +188,14 @@ private static String normalizePattern(String pattern)  {
 
 		return pattern;
 	}
+
+    public static void close(URLClassLoader classLoader) {
+        if (classLoader != null) {
+            try {
+                classLoader.close();
+            } catch (IOException io) {
+                // nothing
+            }
+        }
+    }
 }