Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 10130 invoked from network); 5 Nov 2003 22:03:44 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 5 Nov 2003 22:03:44 -0000 Received: (qmail 61991 invoked by uid 500); 5 Nov 2003 22:03:29 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 61949 invoked by uid 500); 5 Nov 2003 22:03:29 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 61934 invoked by uid 500); 5 Nov 2003 22:03:28 -0000 Received: (qmail 61930 invoked from network); 5 Nov 2003 22:03:28 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 5 Nov 2003 22:03:28 -0000 Received: (qmail 10098 invoked by uid 1652); 5 Nov 2003 22:03:40 -0000 Date: 5 Nov 2003 22:03:40 -0000 Message-ID: <20031105220340.10097.qmail@minotaur.apache.org> From: antoine@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N antoine 2003/11/05 14:03:40 Modified: src/main/org/apache/tools/ant/taskdefs/optional/net Tag: ANT_16_BRANCH FTP.java Log: Merge from HEAD Prevent NPE in checkRemoteSensitivity PR: 24440 Revision Changes Path No revision No revision 1.52.2.4 +3 -0 ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java Index: FTP.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v retrieving revision 1.52.2.3 retrieving revision 1.52.2.4 diff -u -r1.52.2.3 -r1.52.2.4 --- FTP.java 15 Oct 2003 18:45:12 -0000 1.52.2.3 +++ FTP.java 5 Nov 2003 22:03:40 -0000 1.52.2.4 @@ -561,6 +561,9 @@ return listFiles(directory, true); } private void checkRemoteSensitivity(FTPFile[] array, String directory) { + if (array == null) { + return; + } boolean candidateFound = false; String target = null; for (int icounter = 0; icounter < array.length; icounter++) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org