Author: rickhall
Date: Thu Apr 24 20:15:44 2014
New Revision: 1589866
URL: http://svn.apache.org/r1589866
Log:
Apply patch FELIX-4428 to fix bug in handling of fragment candidate capabilities.
Modified:
felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java
Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java
URL: http://svn.apache.org/viewvc/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java?rev=1589866&r1=1589865&r2=1589866&view=diff
==============================================================================
--- felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java (original)
+++ felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java Thu Apr 24 20:15:44 2014
@@ -473,6 +473,9 @@ class Candidates
// a reference to a synthesized resource with attached
// fragments so we can correctly calculate its package
// space.
+ // Must remove the fragment candidate because we must
+ // only use hosted capabilities for package namespace
+ candidates.remove(fragCand);
rc.insertHostedCapability(
candidates,
new WrappedCapability(