ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject svn commit: r582160 - /ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
Date Fri, 05 Oct 2007 09:30:14 GMT
Author: peterreilly
Date: Fri Oct  5 02:30:14 2007
New Revision: 582160

URL: http://svn.apache.org/viewvc?rev=582160&view=rev
Log:
fix for SelectorUtils.isOutOfDate for non-file resources

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java?rev=582160&r1=582159&r2=582160&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java Fri Oct
 5 02:30:14 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;
 
 /**
  * <p>This is a utility class used by selectors and DirectoryScanner. The
@@ -616,10 +617,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


Mime
View raw message