Browse Source

Make sure generic jar is not help open by loader

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272563 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 23 years ago
parent
commit
e2e194c854
2 changed files with 8 additions and 2 deletions
  1. +1
    -1
      src/main/org/apache/tools/ant/AntClassLoader.java
  2. +7
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java

+ 1
- 1
src/main/org/apache/tools/ant/AntClassLoader.java View File

@@ -1107,7 +1107,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
pathComponents = null;
project = null;
for (Enumeration e = zipFiles.elements(); e.hasMoreElements();) {
ZipFile zipFile = (ZipFile) e.nextElement();
ZipFile zipFile = (ZipFile)e.nextElement();
try {
zipFile.close();
} catch (IOException ioe) {


+ 7
- 1
src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java View File

@@ -608,7 +608,8 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
}

//Cycle Through generic and make sure its in weblogic
ClassLoader genericLoader = getClassLoaderFromJar(genericJarFile);
ClassLoader genericLoader
= getClassLoaderFromJar(genericJarFile);

for (Enumeration e = genericEntries.keys(); e.hasMoreElements();) {
String filepath = (String) e.nextElement();
@@ -702,6 +703,11 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
log("Weblogic Jar rebuild needed due to changed "
+ "interface or XML", Project.MSG_VERBOSE);
}
if (genericLoader instanceof AntClassLoader) {
AntClassLoader loader = (AntClassLoader)genericLoader;
loader.cleanup();
}
} else {
rebuild = true;
}


Loading…
Cancel
Save