Return-Path: <bodewig@locus.apache.org>
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 21684 invoked by uid 500); 18 Dec 2000 16:53:37 -0000
Delivered-To: apmail-jakarta-ant-cvs@apache.org
Received: (qmail 21629 invoked by uid 1146); 18 Dec 2000 16:53:35 -0000
Date: 18 Dec 2000 16:53:35 -0000
Message-ID: <20001218165335.21614.qmail@locus.apache.org>
From: bodewig@locus.apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs
 Delete.java

bodewig     00/12/18 08:53:34

  Modified:    src/main/org/apache/tools/ant/taskdefs Delete.java
  Log:
  Avoid NullPointerException in <delete> if the current user is not
  allowed to list the contents of a directory.
  
  Reported by:	"NIkhil R. Deshpande" <nikhild@flashmail.com>
  
  Revision  Changes    Path
  1.11      +1 -0      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java
  
  Index: Delete.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Delete.java	2000/12/05 03:53:15	1.10
  +++ Delete.java	2000/12/18 16:53:33	1.11
  @@ -270,6 +270,7 @@
   
       protected void removeDir(File d) {
           String[] list = d.list();
  +        if (list == null) list = new String[0];
           for (int i = 0; i < list.length; i++) {
               String s = list[i];
               File f = new File(d, s);