Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 31605 invoked from network); 11 Nov 2004 18:06:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 11 Nov 2004 18:06:38 -0000 Received: (qmail 69983 invoked by uid 500); 11 Nov 2004 18:06:36 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 69935 invoked by uid 500); 11 Nov 2004 18:06:36 -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 69922 invoked by uid 500); 11 Nov 2004 18:06:36 -0000 Received: (qmail 69919 invoked by uid 99); 11 Nov 2004 18:06:36 -0000 Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 11 Nov 2004 10:06:36 -0800 Received: (qmail 31585 invoked by uid 1350); 11 Nov 2004 18:06:35 -0000 Date: 11 Nov 2004 18:06:35 -0000 Message-ID: <20041111180635.31584.qmail@minotaur.apache.org> From: sbailliez@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam StarTeamCheckout.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N sbailliez 2004/11/11 10:06:34 Modified: src/main/org/apache/tools/ant/taskdefs/optional/starteam StarTeamCheckout.java Log: Fix a NPE that occurred apparently because Folder.list() can return null Thanks to Bob Evans PR: 31965 Revision Changes Path 1.27 +4 -1 ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java Index: StarTeamCheckout.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- StarTeamCheckout.java 9 Mar 2004 16:48:37 -0000 1.26 +++ StarTeamCheckout.java 11 Nov 2004 18:06:34 -0000 1.27 @@ -580,7 +580,10 @@ } String[] localFiles = localFolder.list(); - + // PR 31965 says that it can return null + if (localFiles == null){ + return this; + } for (int i = 0; i < localFiles.length; i++) { java.io.File localFile = new java.io.File(localFolder, localFiles[i]).getAbsoluteFile(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org