Author: antoine
Date: Sun Nov 7 00:02:57 2010
New Revision: 1032188
URL: http://svn.apache.org/viewvc?rev=1032188&view=rev
Log:
fix for bug 50217, NPE in ftp chmod
Modified:
ant/core/trunk/CONTRIBUTORS
ant/core/trunk/WHATSNEW
ant/core/trunk/contributors.xml
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
Modified: ant/core/trunk/CONTRIBUTORS
URL:
http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=1032188&r1=1032187&r2=1032188&view=diff
==============================================================================
--- ant/core/trunk/CONTRIBUTORS (original)
+++ ant/core/trunk/CONTRIBUTORS Sun Nov 7 00:02:57 2010
@@ -269,6 +269,7 @@ Philip Hourihane
Phillip Wells
Pierre Delisle
Pierre Dittgen
+riasol
R Handerson
Rami Ojares
Randy Watler
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=1032188&r1=1032187&r2=1032188&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sun Nov 7 00:02:57 2010
@@ -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:
--------------
Modified: ant/core/trunk/contributors.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/contributors.xml?rev=1032188&r1=1032187&r2=1032188&view=diff
==============================================================================
--- ant/core/trunk/contributors.xml (original)
+++ ant/core/trunk/contributors.xml Sun Nov 7 00:02:57 2010
@@ -1468,4 +1468,8 @@
<first>Zdenek</first>
<last>Wagner</last>
</name>
+ <name>
+ <first/>
+ <last>riasol</last>
+ </name>
</contributors>
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java?rev=1032188&r1=1032187&r2=1032188&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
Sun Nov 7 00:02:57 2010
@@ -2102,7 +2102,7 @@ public class FTP extends Task implements
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);
}
}
