Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 13495 invoked from network); 5 Oct 2007 09:30:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Oct 2007 09:30:49 -0000 Received: (qmail 52696 invoked by uid 500); 5 Oct 2007 09:30:38 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 52648 invoked by uid 500); 5 Oct 2007 09:30:37 -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 52637 invoked by uid 500); 5 Oct 2007 09:30:37 -0000 Received: (qmail 52634 invoked by uid 99); 5 Oct 2007 09:30:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2007 02:30:37 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2007 09:30:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7040A1A983A; Fri, 5 Oct 2007 02:30:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r582161 - /ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java Date: Fri, 05 Oct 2007 09:30:28 -0000 To: ant-cvs@apache.org From: peterreilly@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071005093028.7040A1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: peterreilly Date: Fri Oct 5 02:30:27 2007 New Revision: 582161 URL: http://svn.apache.org/viewvc?rev=582161&view=rev Log: sync: fix for SelectorUtils.isOutOfDate for non-file resources Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java Modified: ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java URL: http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java?rev=582161&r1=582160&r2=582161&view=diff ============================================================================== --- ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java (original) +++ ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java Fri Oct 5 02:30:27 2007 @@ -24,6 +24,7 @@ import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.types.resources.FileResource; /** *

This is a utility class used by selectors and DirectoryScanner. The @@ -624,10 +625,12 @@ public static boolean isOutOfDate(Resource src, Resource target, long granularity) { long sourceLastModified = src.getLastModified(); - if (sourceLastModified == 0L) { - // Does not exist. Quicker than checking exists() again. - return false; - } + // Check if source exists - use sourceLastModified for file resources + // as it quicker that checking exists() again, however string reources + // have a last modified time of 0 + boolean sourceExists = (src instanceof FileResource) + ? sourceLastModified != 0L : src.isExists(); + long targetLastModified = target.getLastModified(); if (targetLastModified == 0L) { return true; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org