diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions')
2 files changed, 5 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/QueryableFilterAdvice.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/QueryableFilterAdvice.java index cb8acab3c..a36950573 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/QueryableFilterAdvice.java +++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/QueryableFilterAdvice.java @@ -35,8 +35,9 @@ public class QueryableFilterAdvice implements IFilterAdvice { return ((LDAPQuery) ((IInstallableUnit) result.iterator().next()).getFilter()).getFilter(); if (exact) return null; + query = new InstallableUnitQuery(id); - result.addAll(queryable.query(query, null)); + result = queryable.query(query, null); if (!result.isEmpty()) return ((LDAPQuery) ((IInstallableUnit) result.iterator().next()).getFilter()).getFilter(); return null; diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/RootIUResultFilterAdvice.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/RootIUResultFilterAdvice.java index b99dc179a..4e65d9ba4 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/RootIUResultFilterAdvice.java +++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/RootIUResultFilterAdvice.java @@ -9,8 +9,9 @@ ******************************************************************************/ package org.eclipse.equinox.p2.publisher.actions; +import java.util.Arrays; import java.util.Collection; -import org.eclipse.equinox.internal.provisional.p2.metadata.query.Collector; +import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.metadata.query.IQuery; import org.eclipse.equinox.p2.publisher.AbstractAdvice; import org.eclipse.equinox.p2.publisher.IPublisherResult; @@ -26,6 +27,6 @@ public class RootIUResultFilterAdvice extends AbstractAdvice implements IRootIUA Collection value = result.getIUs(null, IPublisherResult.ROOT); if (query == null) return value; - return query.perform(value.iterator(), new Collector()).toCollection(); + return Arrays.asList(query.perform(value.iterator()).toArray(IInstallableUnit.class)); } } |