Modified utility method to get satisfying capability so that it could
handle more than one capability type. (FELIX-28)
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@501925 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/util/Util.java b/framework/src/main/java/org/apache/felix/framework/util/Util.java
index d0e9bb9..ea258fd 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/Util.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/Util.java
@@ -189,16 +189,13 @@
public static ICapability getSatisfyingCapability(IModule m, IRequirement req)
{
- if (req.getNamespace().equals(ICapability.PACKAGE_NAMESPACE))
+ ICapability[] caps = m.getDefinition().getCapabilities();
+ for (int i = 0; (caps != null) && (i < caps.length); i++)
{
- ICapability[] caps = m.getDefinition().getCapabilities();
- for (int i = 0; (caps != null) && (i < caps.length); i++)
+ if (caps[i].getNamespace().equals(req.getNamespace()) &&
+ req.isSatisfied(caps[i]))
{
- if (caps[i].getNamespace().equals(ICapability.PACKAGE_NAMESPACE) &&
- req.isSatisfied(caps[i]))
- {
- return caps[i];
- }
+ return caps[i];
}
}
return null;