diff options
| author | Thomas Watson | 2013-12-09 20:29:40 +0000 |
|---|---|---|
| committer | Thomas Watson | 2013-12-09 20:45:08 +0000 |
| commit | 4eb5b1a47e314d9d73239d294360b427bd946e57 (patch) | |
| tree | 0e5ab454c657c2fbe42f46143e6b03d3257643fc | |
| parent | 4c6549e6614839f60134514c87ed6722b1cf1b3a (diff) | |
| download | rt.equinox.framework-4eb5b1a47e314d9d73239d294360b427bd946e57.tar.gz rt.equinox.framework-4eb5b1a47e314d9d73239d294360b427bd946e57.tar.xz rt.equinox.framework-4eb5b1a47e314d9d73239d294360b427bd946e57.zip | |
Bug 421706 - Can't start Eclipse M3 after installing "everything"
- Fix Felix bug to allow candidates from already resolved fragments
| -rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Candidates.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Candidates.java b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Candidates.java index a652ddcd5..257ba31d4 100644 --- a/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Candidates.java +++ b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/Candidates.java @@ -276,6 +276,12 @@ class Candidates // not optional, then record and throw a resolve exception. else if (candidates.isEmpty() && !Util.isOptional(req)) { + if (Util.isFragment(resource) && rc.getWirings().containsKey(resource)) + { + // This is a fragment that is already resolved and there is no unresolved hosts to attach it to. + m_populateResultCache.put(resource, Boolean.TRUE); + return; + } String msg = "Unable to resolve " + resource + ": missing requirement " + req; if (rethrow != null) |