From ce81059049a47a2d9da23d84245af9763114cd3f Mon Sep 17 00:00:00 2001 From: Antoine Levy-Lambert Date: Sun, 7 Nov 2010 00:02:57 +0000 Subject: [PATCH] fix for bug 50217, NPE in ftp chmod git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1032188 13f79535-47bb-0310-9956-ffa450edef68 --- CONTRIBUTORS | 1 + WHATSNEW | 3 +++ contributors.xml | 4 ++++ src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 6964599bb..bd35ada85 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -269,6 +269,7 @@ Philip Hourihane Phillip Wells Pierre Delisle Pierre Dittgen +riasol R Handerson Rami Ojares Randy Watler diff --git a/WHATSNEW b/WHATSNEW index 0b3885d8d..88f656d05 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -192,6 +192,9 @@ Fixed bugs: provided using non-fileset resource collections. Bugzilla Issue 50115. +* ftp chmod could throw a NPE. + Bugzilla report 50217. + Other changes: -------------- diff --git a/contributors.xml b/contributors.xml index 06be2cd3b..8f8879a07 100644 --- a/contributors.xml +++ b/contributors.xml @@ -1468,4 +1468,8 @@ Zdenek Wagner + + + riasol + 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 67e5e6606..405bfa539 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 @@ -2102,7 +2102,7 @@ public class FTP extends Task implements FTPTaskConfig { myReply = ftp.getReplyStrings(); for (int x = 0; x < myReply.length; x++) { - if (myReply[x].indexOf("200") == -1) { + if (myReply[x] != null && myReply[x].indexOf("200") == -1) { log(myReply[x], Project.MSG_WARN); } }