From 771dd677203f6aea1bd040f604f3dac9e90a198b Mon Sep 17 00:00:00 2001 From: Matthew Jason Benson Date: Tue, 6 Nov 2007 17:45:55 +0000 Subject: [PATCH] BZ 43799 / touch sees e.g. empty fs as unspecified args git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@592499 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Touch.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Touch.java b/src/main/org/apache/tools/ant/taskdefs/Touch.java index 59f242fd6..0aeb67b08 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Touch.java +++ b/src/main/org/apache/tools/ant/taskdefs/Touch.java @@ -85,7 +85,7 @@ public class Touch extends Task { private long millis = -1; private String dateTime; private Vector filesets = new Vector(); - private Union resources = new Union(); + private Union resources; private boolean dateTimeConfigured; private boolean mkdirs; private boolean verbose = true; @@ -212,7 +212,8 @@ public class Touch extends Task { * @param rc the collection to add. * @since Ant 1.7 */ - public void add(ResourceCollection rc) { + public synchronized void add(ResourceCollection rc) { + resources = resources == null ? new Union() : resources; resources.add(rc); } @@ -222,7 +223,7 @@ public class Touch extends Task { * @since Ant 1.6.3 */ protected synchronized void checkConfiguration() throws BuildException { - if (file == null && resources.size() == 0) { + if (file == null && resources == null) { throw new BuildException("Specify at least one source" + "--a file or resource collection."); }