Author: peterreilly
Date: Wed Sep 12 04:35:52 2007
New Revision: 574890
URL: http://svn.apache.org/viewvc?rev=574890&view=rev
Log:
sync
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java?rev=574890&r1=574889&r2=574890&view=diff
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
Wed Sep 12 04:35:52 2007
@@ -371,7 +371,7 @@
}
for (int i = 0; i < newfiles.length; i++) {
FTPFile file = newfiles[i];
- if (file != null
+ if (file != null
&& !file.getName().equals(".")
&& !file.getName().equals("..")) {
if (isFunctioningAsDirectory(ftp, dir, file)) {
@@ -581,7 +581,9 @@
+ target + " where a directory called " +
array[icounter].getName()
+ " exists", Project.MSG_DEBUG);
for (int pcounter = 0; pcounter < array.length;
pcounter++) {
- if (array[pcounter] != null && pcounter !=
icounter && target.equals(array[pcounter].getName()) ) {
+ if (array[pcounter] != null
+ && pcounter != icounter
+ && target.equals(array[pcounter].getName())) {
candidateFound = false;
}
}
@@ -720,7 +722,8 @@
return null;
}
for (int icounter = 0; icounter < theFiles.length; icounter++)
{
- if (theFiles[icounter] != null &&
theFiles[icounter].getName().equalsIgnoreCase(soughtPathElement)) {
+ if (theFiles[icounter] != null
+ &&
theFiles[icounter].getName().equalsIgnoreCase(soughtPathElement)) {
return theFiles[icounter].getName();
}
}
@@ -1833,7 +1836,8 @@
theFiles = ftp.listFiles();
}
for (int counter2 = 0; counter2 < theFiles.length; counter2++)
{
- if (theFiles[counter2] != null &&
theFiles[counter2].getName().equals(fileName)) {
+ if (theFiles[counter2] != null
+ && theFiles[counter2].getName().equals(fileName)) {
found = true;
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
