scohen 2005/05/19 01:54:51
Modified: src/main/org/apache/tools/ant/taskdefs/optional/net Tag:
ANT_16_BRANCH FTP.java
Log:
fix defect 34941 on the 1.6 branch
PR: 34941
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
No revision
No revision
1.52.2.12 +2 -2
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.11
retrieving revision 1.52.2.12
diff -u -r1.52.2.11 -r1.52.2.12
--- FTP.java 15 Mar 2005 15:11:25 -0000 1.52.2.11
+++ FTP.java 19 May 2005 08:54:51 -0000 1.52.2.12
@@ -1580,9 +1580,9 @@
long localTimestamp = localFile.lastModified();
if (this.action == SEND_FILES) {
- return remoteTimestamp + timeDiffMillis > localTimestamp;
+ return remoteTimestamp + timeDiffMillis >= localTimestamp;
} else {
- return localTimestamp > remoteTimestamp + timeDiffMillis;
+ return localTimestamp >= remoteTimestamp + timeDiffMillis;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
