Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 41030 invoked from network); 19 May 2005 08:05:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 May 2005 08:05:35 -0000 Received: (qmail 24675 invoked by uid 500); 19 May 2005 07:59:13 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 24592 invoked by uid 500); 19 May 2005 07:59:11 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 24578 invoked by uid 500); 19 May 2005 07:59:11 -0000 Received: (qmail 24575 invoked by uid 99); 19 May 2005 07:59:10 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 19 May 2005 00:59:09 -0700 Received: (qmail 39399 invoked by uid 1632); 19 May 2005 07:58:54 -0000 Date: 19 May 2005 07:58:54 -0000 Message-ID: <20050519075854.39398.qmail@minotaur.apache.org> From: scohen@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N scohen 2005/05/19 00:58:54 Modified: src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java Log: fix bug 34941 Revision Changes Path 1.72 +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.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- FTP.java 14 May 2005 13:14:14 -0000 1.71 +++ FTP.java 19 May 2005 07:58:54 -0000 1.72 @@ -1722,9 +1722,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: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org