svn commit: r829170 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/plugins/resolver/ChainResolver.java

[maartenc]

Author: maartenc
Date: Fri Oct 23 18:42:40 2009
New Revision: 829170

URL: http://svn.apache.org/viewvc?rev=829170&view=rev
Log:
FIX: ChainResolver doesn't pass the specified 'checkmodified' attribute to the 
cache (IVY-1133)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=829170&r1=829169&r2=829170&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Fri Oct 23 18:42:40 2009
@@ -96,6 +96,7 @@
 =====================================
 - IMPROVEMENT: use defaultconf in combination with defaultconfmapping 
(IVY-1135) (thanks to Jon Schneider)
 
+- FIX: ChainResolver doesn't pass the specified 'checkmodified' attribute to 
the cache (IVY-1133)
 - FIX: Ivy couldn't handle maven POMs that depend on theirselves
 - FIX: SearchEngine.listModules returns MRID without extra attributes 
(IVY-1128) (thanks to Michael Scheetz)
 - FIX: IvyBuildNumber non-deterministic behaviour (IVY-1120)

Modified: 
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java?rev=829170&r1=829169&r2=829170&view=diff
==============================================================================
--- 
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java 
(original)
+++ 
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java 
Fri Oct 23 18:42:40 2009
@@ -73,34 +73,10 @@
 
     private boolean dual;
 
-    private Boolean checkmodified = null;
-
     public void add(DependencyResolver resolver) {
         chain.add(resolver);
     }
 
-    /**
-     * True if this resolver should check lastmodified date to know if ivy 
files are up to date.
-     * 
-     * @return
-     */
-    public boolean isCheckmodified() {
-        if (checkmodified == null) {
-            if (getSettings() != null) {
-                String check = 
getSettings().getVariable("ivy.resolver.default.check.modified");
-                return check != null ? Boolean.valueOf(check).booleanValue() : 
false;
-            } else {
-                return false;
-            }
-        } else {
-            return checkmodified.booleanValue();
-        }
-    }
-
-    public void setCheckmodified(boolean check) {
-        checkmodified = Boolean.valueOf(check);
-    }
-
     public ResolvedModuleRevision getDependency(DependencyDescriptor dd, 
ResolveData data)
             throws ParseException {
         data = new ResolveData(data, doValidate(data));
@@ -115,9 +91,7 @@
             mr = findModuleInCache(dd, data, true);
             if (mr != null) {
                 Message.verbose(getName() + ": module revision found in cache: 
" + mr.getId());
-                if (!isCheckmodified()) {
-                    mr = forcedRevision(mr);
-                }
+                mr = forcedRevision(mr);
             }
         }