On 2018-04-06, <gin...@apache.org> wrote: > http://git-wip-us.apache.org/repos/asf/ant/blob/c3b91f90/src/main/org/apache/tools/ant/types/ArchiveFileSet.java > ---------------------------------------------------------------------- > diff --git a/src/main/org/apache/tools/ant/types/ArchiveFileSet.java > b/src/main/org/apache/tools/ant/types/ArchiveFileSet.java > index e4b9d12..eea603d 100644 > --- a/src/main/org/apache/tools/ant/types/ArchiveFileSet.java >>>> b/src/main/org/apache/tools/ant/types/ArchiveFileSet.java > @@ -223,7 +223,7 @@ public abstract class ArchiveFileSet extends FileSet { > */ > public void setPrefix(String prefix) { > checkArchiveAttributesAllowed(); > - if (!"".equals(prefix) && !"".equals(fullpath)) { > + if (!prefix.isEmpty() && !fullpath.isEmpty()) { > throw new BuildException(ERROR_PATH_AND_PREFIX); > } > this.prefix = prefix; > @@ -250,7 +250,7 @@ public abstract class ArchiveFileSet extends FileSet { > */ > public void setFullpath(String fullpath) { > checkArchiveAttributesAllowed(); > - if (!"".equals(prefix) && !"".equals(fullpath)) { > + if (!prefix.isEmpty() && !fullpath.isEmpty()) { > throw new BuildException(ERROR_PATH_AND_PREFIX); > } > this.fullpath = fullpath;
in both hunks prefix or fullpath could be null. Obviously the old code doesn't handle this properly either. Do we want to keep assuming nobody invokes either method with a null argument? I'm afraid we aren't really consistent with the attribute setters dealing with null args. Stefan --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org For additional commands, e-mail: dev-h...@ant.apache.org
