From 8443b8b1a185358852bff4e224f29afa0e4f67f8 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 27 Aug 2003 09:34:25 +0000
Subject: [PATCH] resolve relative paths in file and todir attributes like all
 other Ant tasks do - i.e. relative to basedir

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275146 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tools/ant/taskdefs/optional/ssh/Scp.java       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
index 5754c35fd..1489ddb27 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
@@ -177,10 +177,10 @@ public class Scp extends SSHBase {
         Session session = null;
         try {
             session = openSession();
-            ScpFromMessage message = new ScpFromMessage(session,
-                                                         file,
-                                                         new File(toPath),
-                                                         fromSshUri.endsWith("*"));
+            ScpFromMessage message = 
+                new ScpFromMessage(session, file, 
+                                   getProject().resolveFile(toPath),
+                                   fromSshUri.endsWith("*"));
             log("Receiving file: " + file);
             message.setLogListener(this);
             message.execute();
@@ -222,9 +222,9 @@ public class Scp extends SSHBase {
         Session session = null;
         try {
             session = openSession();
-            ScpToMessage message = new ScpToMessage(session,
-                                                     new File(fromPath),
-                                                     file);
+            ScpToMessage message = 
+                new ScpToMessage(session, getProject().resolveFile(fromPath),
+                                 file);
             message.setLogListener(this);
             message.execute();
         } finally {