Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2015-09-10 15:01:54 +0000
committerThomas Watson2015-09-10 15:03:43 +0000
commit5e5bc32ca0b7903b947cf577314798101cba751b (patch)
treecb1fe050fcce2046324c9c159c509799e6ea94f0 /bundles/org.eclipse.equinox.region
parent89694b4e1f0e4fa9b370dcfb77b6b35e0fb98b8f (diff)
downloadrt.equinox.bundles-5e5bc32ca0b7903b947cf577314798101cba751b.tar.gz
rt.equinox.bundles-5e5bc32ca0b7903b947cf577314798101cba751b.tar.xz
rt.equinox.bundles-5e5bc32ca0b7903b947cf577314798101cba751b.zip
Bug 477071 - [region] should filter resolution of bundles that are unknown to region
Diffstat (limited to 'bundles/org.eclipse.equinox.region')
-rw-r--r--bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionResolverHook.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionResolverHook.java b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionResolverHook.java
index 42e1126a3..e1d94b3e4 100644
--- a/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionResolverHook.java
+++ b/bundles/org.eclipse.equinox.region/src/org/eclipse/equinox/internal/region/hook/RegionResolverHook.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2013 VMware Inc.
+ * Copyright (c) 2011, 2015 VMware Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -118,8 +118,12 @@ public final class RegionResolverHook implements ResolverHook {
@Override
public void filterResolvable(Collection<BundleRevision> candidates) {
- // do nothing
- // may want to consider only allowing candidates contained in the region of the trigger revisions?
+ // filter any revisions that have no region
+ for (Iterator<BundleRevision> iCandidates = candidates.iterator(); iCandidates.hasNext();) {
+ if (getRegion(iCandidates.next()) == null) {
+ iCandidates.remove();
+ }
+ }
}
@Override

Back to the top