diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java index a42c29707..6622a850e 100644 --- a/src/main/org/apache/tools/ant/AntClassLoader.java +++ b/src/main/org/apache/tools/ant/AntClassLoader.java @@ -47,7 +47,7 @@ import org.apache.tools.ant.util.LoaderUtils; */ public class AntClassLoader extends ClassLoader implements SubBuildListener { - private static final FileUtils fileUtils = FileUtils.newFileUtils(); + private static final FileUtils FILE_UTILS = FileUtils.newFileUtils(); /** * An enumeration of all resources of a given name found within the @@ -909,7 +909,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener { if (resource.exists()) { try { - return fileUtils.getFileURL(resource); + return FILE_UTILS.getFileURL(resource); } catch (MalformedURLException ex) { return null; } @@ -924,7 +924,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener { ZipEntry entry = zipFile.getEntry(resourceName); if (entry != null) { try { - return new URL("jar:" + fileUtils.getFileURL(file) + return new URL("jar:" + FILE_UTILS.getFileURL(file) + "!/" + entry); } catch (MalformedURLException ex) { return null; diff --git a/src/main/org/apache/tools/ant/Executor.java b/src/main/org/apache/tools/ant/Executor.java index 00e338aaa..fff002dc7 100755 --- a/src/main/org/apache/tools/ant/Executor.java +++ b/src/main/org/apache/tools/ant/Executor.java @@ -27,7 +27,7 @@ public interface Executor { * Execute the specified Targets for the specified Project. * @param project the Ant Project. * @param targetNames String[] of Target names. - * @throws BuildException. + * @throws BuildException on error */ void executeTargets(Project project, String[] targetNames) throws BuildException; diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java index 13ab110a6..2279cc10c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Exit.java +++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java @@ -106,7 +106,7 @@ public class Exit extends Task { * The error message is constructed from the text fields, from * the nested condition (if specified), or finally from * the if and unless parameters (if present). - * @throws BuildException + * @throws BuildException on error */ public void execute() throws BuildException { boolean fail = (nestedConditionPresent()) ? testNestedCondition() diff --git a/src/main/org/apache/tools/ant/taskdefs/Input.java b/src/main/org/apache/tools/ant/taskdefs/Input.java index 72790f1dc..e0e6c6c22 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Input.java +++ b/src/main/org/apache/tools/ant/taskdefs/Input.java @@ -95,7 +95,7 @@ public class Input extends Task { /** * Actual method executed by ant. - * @throws BuildException + * @throws BuildException on error */ public void execute () throws BuildException { if (addproperty != null diff --git a/src/main/org/apache/tools/ant/taskdefs/Sleep.java b/src/main/org/apache/tools/ant/taskdefs/Sleep.java index 25711ff1a..91d86575a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Sleep.java +++ b/src/main/org/apache/tools/ant/taskdefs/Sleep.java @@ -121,6 +121,7 @@ public class Sleep extends Task { try { Thread.sleep(millis); } catch (InterruptedException ie) { + // Ignore Exception } }