diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java index a9a540c62..18feef827 100644 --- a/src/main/org/apache/tools/ant/Main.java +++ b/src/main/org/apache/tools/ant/Main.java @@ -440,9 +440,6 @@ public class Main implements AntMain { if (searchForFile) { if (searchForThis != null) { buildFile = findBuildFile(System.getProperty("user.dir"), searchForThis); - if (buildFile == null) { - throw new BuildException("Could not locate a build file!"); - } } else { // no search file specified: so search an existing default file final Iterator it = ProjectHelperRepository.getInstance().getHelpers(); @@ -454,9 +451,9 @@ public class Main implements AntMain { } buildFile = findBuildFile(System.getProperty("user.dir"), searchForThis); } while (buildFile == null && it.hasNext()); - if (buildFile == null) { - throw new BuildException("Could not locate a build file!"); - } + } + if (buildFile == null) { + throw new BuildException("Could not locate a build file!"); } } else { // no build file specified: so search an existing default file diff --git a/src/main/org/apache/tools/ant/PropertyHelper.java b/src/main/org/apache/tools/ant/PropertyHelper.java index 94a031feb..154ffdfd9 100644 --- a/src/main/org/apache/tools/ant/PropertyHelper.java +++ b/src/main/org/apache/tools/ant/PropertyHelper.java @@ -1048,12 +1048,11 @@ public class PropertyHelper implements GetProperty { if (value.charAt(pos + 1) == '$') { //backwards compatibility two $ map to one mode fragments.addElement("$"); - prev = pos + 2; } else { //new behaviour: $X maps to $X for all values of X!='$' fragments.addElement(value.substring(pos, pos + 2)); - prev = pos + 2; } + prev = pos + 2; } else { //property found, extract its name or bail on a typo int endName = value.indexOf('}', pos); diff --git a/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java b/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java index 96fd274fd..f813eba0e 100644 --- a/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java +++ b/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java @@ -282,8 +282,6 @@ public class CommonsLoggingListener implements BuildListener, BuildLogger { } break; case Project.MSG_VERBOSE: - log.debug(message); - break; case Project.MSG_DEBUG: log.debug(message); break; diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java b/src/main/org/apache/tools/ant/listener/Log4jListener.java index 3720d858a..169fdf569 100644 --- a/src/main/org/apache/tools/ant/listener/Log4jListener.java +++ b/src/main/org/apache/tools/ant/listener/Log4jListener.java @@ -155,8 +155,6 @@ public class Log4jListener implements BuildListener { log.info(event.getMessage()); break; case Project.MSG_VERBOSE: - log.debug(event.getMessage()); - break; case Project.MSG_DEBUG: log.debug(event.getMessage()); break; diff --git a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java index 9095c5e3b..642486878 100644 --- a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java +++ b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java @@ -72,13 +72,11 @@ public class KeySubst extends Task { String newline = null; line = br.readLine(); while (line != null) { - if (line.isEmpty()) { - bw.newLine(); - } else { + if (!line.isEmpty()) { newline = KeySubst.replace(line, replacements); bw.write(newline); - bw.newLine(); } + bw.newLine(); line = br.readLine(); } bw.flush(); diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index 9efae6d4d..aa95aa219 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -623,10 +623,8 @@ public class Zip extends MatchingTask { skipWriting = true; executeMain(); skipWriting = false; - executeMain(); - } else { - executeMain(); } + executeMain(); } /** diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java index 0eb79c371..1219fabd7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java @@ -136,8 +136,6 @@ public class Http extends ProjectComponent implements Condition { } catch (ProtocolException pe) { throw new BuildException("Invalid HTTP protocol: " + requestMethod, pe); - } catch (SocketTimeoutException ste) { - return false; } catch (IOException e) { return false; } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java index 0a44ec058..dbe24470b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java @@ -64,6 +64,10 @@ class ConstantPool { break; case INTEGER : + case FIELDREF : + case METHODREF : + case INTERFACEMETHODREF : + case NAMEANDTYPE : values[i] = data.readInt(); break; @@ -86,12 +90,6 @@ class ConstantPool { values[i] = data.readUnsignedShort(); break; - case FIELDREF : - case METHODREF : - case INTERFACEMETHODREF : - case NAMEANDTYPE : - values[i] = data.readInt(); - break; default: // Do nothing } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index 90bb9a184..5e2c9358d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -561,9 +561,6 @@ public class FTP extends Task implements FTPTaskConfig { } ftp.changeToParentDirectory(); - } catch (FTPConnectionClosedException ftpcce) { - throw new BuildException("Error while communicating with FTP " - + "server: ", ftpcce); } catch (IOException e) { throw new BuildException("Error while communicating with FTP " + "server: ", e); @@ -2535,16 +2532,12 @@ public class FTP extends Task implements FTPTaskConfig { if (binary) { ftp.setFileType(org.apache.commons.net.ftp.FTP.BINARY_FILE_TYPE); - if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) { - throw new BuildException("could not set transfer type: %s", - ftp.getReplyString()); - } } else { ftp.setFileType(org.apache.commons.net.ftp.FTP.ASCII_FILE_TYPE); - if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) { - throw new BuildException("could not set transfer type: %s", - ftp.getReplyString()); - } + } + if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) { + throw new BuildException("could not set transfer type: %s", + ftp.getReplyString()); } if (passive) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java index aec12cc42..db63d952b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java @@ -1812,16 +1812,12 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror { if (task.isBinary()) { ftp.setFileType(org.apache.commons.net.ftp.FTP.BINARY_FILE_TYPE); - if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) { - throw new BuildException("could not set transfer type: %s", - ftp.getReplyString()); - } } else { ftp.setFileType(org.apache.commons.net.ftp.FTP.ASCII_FILE_TYPE); - if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) { - throw new BuildException("could not set transfer type: %s", - ftp.getReplyString()); - } + } + if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) { + throw new BuildException("could not set transfer type: %s", + ftp.getReplyString()); } if (task.isPassive()) { diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java b/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java index 37e7a2150..db1069bef 100644 --- a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java +++ b/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java @@ -115,16 +115,11 @@ public class DependencyVisitor extends EmptyVisitor { // is upper case ascii. so according to the spec it's an inner class classname = classname.substring(0, index) + "$" + classname.substring(index + 1); - addClass(classname); - } else { - // Add the class in dotted notation 'com.company.Class' - addClass(classname); } // CheckStyle:MagicNumber ON - } else { - // Add a class with no package 'Class' - addClass(classname); } + // Add the class, with or without the package name + addClass(classname); } }