From b423ccde3be30412bfa9592789fbb17fe68add5e Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 24 Jun 2004 11:56:21 +0000
Subject: [PATCH] Some cleanup

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276623 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/taskdefs/Ant.java        |  1 -
 .../org/apache/tools/ant/taskdefs/ExecuteJava.java     |  1 +
 .../org/apache/tools/ant/taskdefs/XSLTProcess.java     |  1 +
 .../org/apache/tools/ant/taskdefs/optional/ANTLR.java  | 10 +++++++---
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java
index 09b9864fc..4d9131386 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Ant.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java
@@ -28,7 +28,6 @@ import java.util.Iterator;
 import java.util.Vector;
 import java.util.Set;
 import java.util.HashSet;
-import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildListener;
 import org.apache.tools.ant.DefaultLogger;
diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
index 503c26262..b2b327382 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
@@ -174,6 +174,7 @@ public class ExecuteJava implements Runnable, TimeoutObserver {
             if (loader != null) {
                 loader.resetThreadContextLoader();
                 loader.cleanup();
+                loader = null;
             }
             if (sysProperties != null) {
                 sysProperties.restoreSystem();
diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
index ebe05a0b1..a1a776b31 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
@@ -270,6 +270,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger {
         } finally {
             if (loader != null) {
                 loader.resetThreadContextLoader();
+                loader.cleanup();
                 loader = null;
             }
             liaison = null;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
index e54dfb1d0..7efd88c45 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
@@ -402,13 +402,17 @@ public class ANTLR extends Task {
      * @since Ant 1.6
      */
     protected boolean is272() {
+        AntClassLoader l = null;
         try {
-            AntClassLoader l = new AntClassLoader(getProject(),
-                                                  commandline.getClasspath());
+            l = getProject().createClassLoader(commandline.getClasspath());
             l.loadClass("antlr.Version");
             return true;
         } catch (ClassNotFoundException e) {
             return false;
-        } // end of try-catch
+        } finally {
+            if (l != null) {
+                l.cleanup();
+            }
+        }
     }
 }