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;
/**
* <p>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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
