You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2014/12/12 21:51:36 UTC
svn commit: r1645067 -
/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/WrappedResource.java
Author: rickhall
Date: Fri Dec 12 20:51:35 2014
New Revision: 1645067
URL: http://svn.apache.org/r1645067
Log:
Apply patch FELIX-4727 to correctly handle namespaces in wrapped resources.
Modified:
felix/trunk/resolver/src/main/java/org/apache/felix/resolver/WrappedResource.java
Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/WrappedResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/WrappedResource.java?rev=1645067&r1=1645066&r2=1645067&view=diff
==============================================================================
--- felix/trunk/resolver/src/main/java/org/apache/felix/resolver/WrappedResource.java (original)
+++ felix/trunk/resolver/src/main/java/org/apache/felix/resolver/WrappedResource.java Fri Dec 12 20:51:35 2014
@@ -58,7 +58,7 @@ class WrappedResource implements Resourc
List<Capability> caps = new ArrayList<Capability>();
// Wrap host capabilities.
- for (Capability cap : m_host.getCapabilities(null))
+ for (Capability cap : m_host.getCapabilities(namespace))
{
caps.add(new WrappedCapability(this, cap));
}
@@ -68,7 +68,7 @@ class WrappedResource implements Resourc
{
for (Resource fragment : m_fragments)
{
- for (Capability cap : fragment.getCapabilities(null))
+ for (Capability cap : fragment.getCapabilities(namespace))
{
// Filter out identity capabilities, since they
// are not part of the fragment payload.