Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2010-08-29 21:15:23 -0400
committerPascal Rapicault2010-08-29 21:15:23 -0400
commit0afc036d99ca274bbc9f58a2ecea43d8e0525315 (patch)
tree2776102e994592c739ac3553609805aa335987f5 /bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2
parenta8f7d39878090ee9b811843e27646c5703f29f97 (diff)
downloadrt.equinox.p2-0afc036d99ca274bbc9f58a2ecea43d8e0525315.tar.gz
rt.equinox.p2-0afc036d99ca274bbc9f58a2ecea43d8e0525315.tar.xz
rt.equinox.p2-0afc036d99ca274bbc9f58a2ecea43d8e0525315.zip
Release code to address stability issue
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2')
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
index 65be6f2a2..1d77cdc68 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
@@ -269,10 +269,15 @@ public class Projector {
BigInteger maxWeight = POWER;
for (Entry<String, Map<Version, IInstallableUnit>> entry : s) {
Map<Version, IInstallableUnit> conflictingEntries = entry.getValue();
+
+ List<IInstallableUnit> toSort = new ArrayList<IInstallableUnit>(conflictingEntries.values());
if (conflictingEntries.size() == 1) {
+ IInstallableUnit iu = toSort.get(0);
+ if (iu != metaIu) {
+ weightedObjects.add(WeightedObject.newWO(iu, POWER));
+ }
continue;
}
- List<IInstallableUnit> toSort = new ArrayList<IInstallableUnit>(conflictingEntries.values());
Collections.sort(toSort, Collections.reverseOrder());
BigInteger weight = POWER;
int count = toSort.size();

Back to the top