ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
Date Wed, 05 Nov 2003 22:03:40 GMT
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


Mime
View raw message