bodewig 2004/06/24 04:56:21
Modified: src/main/org/apache/tools/ant/taskdefs Ant.java
ExecuteJava.java XSLTProcess.java
src/main/org/apache/tools/ant/taskdefs/optional ANTLR.java
Log:
Some cleanup
Revision Changes Path
1.103 +0 -1 ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
Index: Ant.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- Ant.java 24 Jun 2004 11:16:41 -0000 1.102
+++ Ant.java 24 Jun 2004 11:56:20 -0000 1.103
@@ -28,7 +28,6 @@
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;
1.44 +1 -0
ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
Index: ExecuteJava.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ExecuteJava.java 9 Mar 2004 16:48:04 -0000 1.43
+++ ExecuteJava.java 24 Jun 2004 11:56:21 -0000 1.44
@@ -174,6 +174,7 @@
if (loader != null) {
loader.resetThreadContextLoader();
loader.cleanup();
+ loader = null;
}
if (sysProperties != null) {
sysProperties.restoreSystem();
1.86 +2 -1
ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- XSLTProcess.java 16 Apr 2004 09:59:02 -0000 1.85
+++ XSLTProcess.java 24 Jun 2004 11:56:21 -0000 1.86
@@ -270,6 +270,7 @@
} finally {
if (loader != null) {
loader.resetThreadContextLoader();
+ loader.cleanup();
loader = null;
}
liaison = null;
1.39 +7 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
Index: ANTLR.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ANTLR.java 9 Mar 2004 16:48:14 -0000 1.38
+++ ANTLR.java 24 Jun 2004 11:56:21 -0000 1.39
@@ -402,13 +402,17 @@
* @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();
+ }
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
