From 3935277bce3e9a77f33daf3d33f1efed1f0f64a4 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 23 Sep 2009 15:40:32 +0000 Subject: [PATCH] improve logging git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@818143 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Get.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Get.java b/src/main/org/apache/tools/ant/taskdefs/Get.java index bb57b7a11..fa3a8c87e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Get.java +++ b/src/main/org/apache/tools/ant/taskdefs/Get.java @@ -105,11 +105,19 @@ public class Get extends Task { dest = new File(destination, path); } else { FileNameMapper mapper = mapperElement.getImplementation(); - String[] d = mapper.mapFileName(r.getName()); - if (d == null || d.length != 1) { + String[] d = mapper.mapFileName(source.toString()); + if (d == null) { log("skipping " + r + " - mapper can't handle it", Project.MSG_WARN); continue; + } else if (d.length == 0) { + log("skipping " + r + " - mapper returns no file name", + Project.MSG_WARN); + continue; + } else if (d.length > 1) { + log("skipping " + r + " - mapper returns multiple file" + + " names", Project.MSG_WARN); + continue; } dest = new File(destination, d[0]); }