Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2010-01-13 15:03:12 -0500
committerJohn Arthorne2010-01-13 15:03:12 -0500
commitf031fcad42aba2db0ff1972983b030d885fcc93b (patch)
tree393d10731d691c227e6e91aa10909563fbbdc045 /bundles/org.eclipse.equinox.p2.artifact.repository
parent80f9247589cad1dd51105c9d0f170d87cd19c94b (diff)
downloadrt.equinox.p2-f031fcad42aba2db0ff1972983b030d885fcc93b.tar.gz
rt.equinox.p2-f031fcad42aba2db0ff1972983b030d885fcc93b.tar.xz
rt.equinox.p2-f031fcad42aba2db0ff1972983b030d885fcc93b.zip
Bug 297408 - CompositeArtifactRepository marks child bad on missing artifact
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.artifact.repository')
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java43
1 files changed, 28 insertions, 15 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java
index d51ed96c4..a8936f302 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java
@@ -337,20 +337,23 @@ public class CompositeArtifactRepository extends AbstractArtifactRepository impl
if (current.isGood() && current.repo.contains(descriptor)) {
// Child hasn't failed & contains descriptor
IStatus status = raw ? current.repo.getRawArtifact(descriptor, destination, monitor) : current.repo.getArtifact(descriptor, destination, monitor);
- if (!status.isOK()) {
- // Download failed
- if (status.getCode() == CODE_RETRY || status.getCode() == IStatus.CANCEL)
- // Child has mirrors & wants to be retried, or we were canceled
- return status;
- // Child has failed us, mark it bad
- current.setBad();
- if (childIterator.hasNext())
- // More children are available, set retry
- return new MultiStatus(Activator.ID, CODE_RETRY, new IStatus[] {status}, NLS.bind(Messages.retryRequest, current.repo.getLocation(), descriptor.getArtifactKey()), null);
- // Nothing that can be done, pass child's failure on
- return status;
+ if (status.isOK()) {
+ //we are done with this artifact so forgive bad children so they can try again on next artifact
+ resetChildFailures();
+ return Status.OK_STATUS;
}
- return Status.OK_STATUS;
+ // Download failed
+ if (status.getCode() == CODE_RETRY || status.getCode() == IStatus.CANCEL)
+ // Child has mirrors & wants to be retried, or we were canceled
+ return status;
+ // Child has failed us, mark it bad
+ current.setBad(true);
+ // If more children are available, set retry
+ if (childIterator.hasNext())
+ return new MultiStatus(Activator.ID, CODE_RETRY, new IStatus[] {status}, NLS.bind(Messages.retryRequest, current.repo.getLocation(), descriptor.getArtifactKey()), null);
+ // Nothing that can be done, pass child's failure on
+ resetChildFailures();
+ return status;
}
if (monitor.isCanceled())
return Status.CANCEL_STATUS;
@@ -358,6 +361,16 @@ public class CompositeArtifactRepository extends AbstractArtifactRepository impl
return new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.artifact_not_found, descriptor));
}
+ /**
+ * Rests the failure state on all children to 'good'. This is done after a successful
+ * download to ensure that children who failed to obtain one artifact get a chance
+ * on the next artifact.
+ */
+ private void resetChildFailures() {
+ for (ChildInfo current : loadedRepos)
+ current.setBad(false);
+ }
+
private IArtifactRequest[] filterUnfetched(IArtifactRequest[] requests) {
ArrayList<IArtifactRequest> filteredRequests = new ArrayList<IArtifactRequest>();
for (int i = 0; i < requests.length; i++) {
@@ -508,8 +521,8 @@ public class CompositeArtifactRepository extends AbstractArtifactRepository impl
this.repo = IArtifactRepository;
}
- void setBad() {
- good = false;
+ void setBad(boolean bad) {
+ good = !bad;
}
boolean isGood() {

Back to the top