From d2693fcfed2230ef91eb1cf56f9abbdcaab1aeb2 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 15 Apr 2011 07:24:35 +0000 Subject: [PATCH] commons-net trunk has removed all static final ints from FTPReply git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1092610 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/optional/net/FTP.java | 8 +++++--- .../taskdefs/optional/net/FTPTaskMirrorImpl.java | 14 +++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index 2f1b44dda..ef20aa089 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -88,8 +88,10 @@ public class FTP extends Task implements FTPTaskConfig { protected static final int CHMOD = 5; protected static final int RM_DIR = 6; protected static final int SITE_CMD = 7; - /** return code of ftp - not implemented in commons-net version 1.0 */ + /** return code of ftp */ private static final int CODE_521 = 521; + private static final int CODE_550 = 550; + private static final int CODE_553 = 553; /** adjust uptodate calculations where server timestamps are HH:mm and client's * are HH:mm:ss */ @@ -2375,7 +2377,7 @@ public class FTP extends Task implements FTPTaskConfig { // failed because the directory already exists. int rc = ftp.getReplyCode(); if (!(ignoreNoncriticalErrors - && (rc == FTPReply.CODE_550 || rc == FTPReply.CODE_553 + && (rc == CODE_550 || rc == CODE_553 || rc == CODE_521))) { throw new BuildException("could not create directory: " + ftp.getReplyString()); @@ -2406,7 +2408,7 @@ public class FTP extends Task implements FTPTaskConfig { throws BuildException { int rc = ftp.getReplyCode(); if (!(ignoreNoncriticalErrors - && (rc == FTPReply.CODE_550 || rc == FTPReply.CODE_553 || rc == CODE_521))) { + && (rc == CODE_550 || rc == CODE_553 || rc == CODE_521))) { throw new BuildException("could not create directory: " + ftp.getReplyString()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java index 3c250d26a..dd5daf63d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java @@ -54,8 +54,10 @@ import org.apache.tools.ant.util.VectorSet; public class FTPTaskMirrorImpl implements FTPTaskMirror { - /** return code of ftp - not implemented in commons-net version 1.0 */ + /** return code of ftp */ private static final int CODE_521 = 521; + private static final int CODE_550 = 550; + private static final int CODE_553 = 553; /** Date formatter used in logging, note not thread safe! */ private static final SimpleDateFormat TIMESTAMP_LOGGING_SDF = @@ -1775,8 +1777,9 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror { // to indicate that an attempt to create a directory has // failed because the directory already exists. int rc = ftp.getReplyCode(); - if (!(task.isIgnoreNoncriticalErrors() && (rc == FTPReply.CODE_550 - || rc == FTPReply.CODE_553 || rc == CODE_521))) { + if (!(task.isIgnoreNoncriticalErrors() && (rc == CODE_550 + || rc == CODE_553 + || rc == CODE_521))) { throw new BuildException("could not create directory: " + ftp.getReplyString()); } @@ -1805,8 +1808,9 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror { private void handleMkDirFailure(FTPClient ftp) throws BuildException { int rc = ftp.getReplyCode(); - if (!(task.isIgnoreNoncriticalErrors() && (rc == FTPReply.CODE_550 - || rc == FTPReply.CODE_553 || rc == CODE_521))) { + if (!(task.isIgnoreNoncriticalErrors() && (rc == CODE_550 + || rc == CODE_553 + || rc == CODE_521))) { throw new BuildException("could not create directory: " + ftp.getReplyString()); }