Browse Source

fix a problem of protected access to FTP.resolveFile

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275027 13f79535-47bb-0310-9956-ffa450edef68
master
Antoine Levy-Lambert 22 years ago
parent
commit
225b9fd6f9
1 changed files with 7 additions and 4 deletions
  1. +7
    -4
      src/testcases/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java

+ 7
- 4
src/testcases/org/apache/tools/ant/taskdefs/optional/net/FTPTest.java View File

@@ -70,7 +70,6 @@ public class FTPTest extends BuildFileTest{
&& !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1);

private FTPClient ftp;
private FTP ftptask;
private boolean connectionSucceeded = true;
private boolean loginSuceeded = true;
private String tmpDir = null;
@@ -86,10 +85,9 @@ public class FTPTest extends BuildFileTest{
getProject().executeTarget("setup");
tmpDir = getProject().getProperty("tmp.dir");
ftp = new FTPClient();
ftptask = new FTP();
ftpFileSep = getProject().getProperty("ftp.filesep");
ftptask.setSeparator(ftpFileSep);
remoteTmpDir = ftptask.resolveFile(tmpDir);
myFTPTask.setSeparator(ftpFileSep);
remoteTmpDir = myFTPTask.resolveFile(tmpDir);
String remoteHost = getProject().getProperty("ftp.host");
int port = Integer.parseInt(getProject().getProperty("ftp.port"));
String remoteUser = getProject().getProperty("ftp.user");
@@ -526,5 +524,10 @@ public class FTPTest extends BuildFileTest{
public FTP.FTPDirectoryScanner newScanner(FTPClient client) {
return new FTP.FTPDirectoryScanner(client);
}
// provide public visibility
public String resolveFile(String file) {
return super.resolveFile(file);
}

}
}

Loading…
Cancel
Save