From a7f0867fda509ec74978e8b46b804ed9db399926 Mon Sep 17 00:00:00 2001
From: Erik Hatcher <ehatcher@apache.org>
Date: Tue, 5 Feb 2002 00:56:00 +0000
Subject: [PATCH] Fix single-file fileset functionality.  Did this ever work
 (,Peter)?

XP-style: added test case to detect bug, then fixed it. Also, trying to break out of the mould of the "testN" test case names - too brittle and non-descriptive.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271143 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/copy.xml                       | 7 +++++++
 src/main/org/apache/tools/ant/taskdefs/Copy.java          | 2 +-
 src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java | 7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/etc/testcases/taskdefs/copy.xml b/src/etc/testcases/taskdefs/copy.xml
index 24adfd693..81785196a 100644
--- a/src/etc/testcases/taskdefs/copy.xml
+++ b/src/etc/testcases/taskdefs/copy.xml
@@ -38,12 +38,19 @@
     -->
   </target>
   
+  <target name="test_single_file_fileset">
+    <copy tofile="copytest_single_file_fileset.tmp">
+      <fileset dir="." includes="copy.xml"/>
+    </copy>
+  </target>
+  
   <target name="cleanup"> 
     <delete file="copytest1.tmp"/>
     <delete file="copytest3.tmp"/>
     <delete file="copytest3a.tmp"/>
     <delete file="copytest3b.tmp"/>
     <delete file="copytest3c.tmp"/>
+    <delete file="copytest_single_file_fileset.tmp"/>
     <delete dir="copytest1dir"/>
   </target>
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java
index 3ac8b9226..fa574f0fe 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Copy.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java
@@ -326,7 +326,7 @@ public class Copy extends Task {
 
                 if (srcFiles.length > 0) {
                     if (file == null) {
-                        file = new File(srcFiles[0]);
+                        file = new File(ds.getBasedir(), srcFiles[0]);
                         filesets.removeElementAt(0);
                     } else {
                         throw new BuildException(
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java
index 246ce9056..34383c728 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java
@@ -122,4 +122,11 @@ public class CopyTest extends BuildFileTest {
         }
 
     }
+    
+    public void testSingleFileFileset() {
+        executeTarget("test_single_file_fileset");
+        File file  = new File(getProjectDir(), 
+                                        "copytest_single_file_fileset.tmp");
+        assertTrue(file.exists());
+    }
 }