FIX: ChainResolver doesn't pass the specified 'checkmodified' attribute to the cache (IVY-1133)

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@829170 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maarten Coene 2009-10-23 18:42:40 +00:00
parent 12060a3336
commit 05712301fc
2 changed files with 2 additions and 27 deletions

View File

@ -96,6 +96,7 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
=====================================
- 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)

View File

@ -73,34 +73,10 @@ public class ChainResolver extends AbstractResolver {
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 @@ public class ChainResolver extends AbstractResolver {
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);
}
}