You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2010/02/26 18:25:58 UTC
svn commit: r916766 - in
/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository:
Requirement.java impl/RequirementImpl.java impl/ResolverImpl.java
Author: gnodet
Date: Fri Feb 26 17:25:58 2010
New Revision: 916766
URL: http://svn.apache.org/viewvc?rev=916766&view=rev
Log:
FELIX-2140: The Requirement#isSatisfied() method should actually check the capability/requirement namespace
Modified:
felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Requirement.java
felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RequirementImpl.java
felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java
Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Requirement.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Requirement.java?rev=916766&r1=916765&r2=916766&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Requirement.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Requirement.java Fri Feb 26 17:25:58 2010
@@ -49,6 +49,12 @@
String getComment();
+ /**
+ * Check if the given capability satisfied this requirement.
+ *
+ * @param capability the capability to check
+ * @return <code>true</code> is the capability satisfies this requirement, <code>false</code> otherwise
+ */
boolean isSatisfied(Capability capability);
/**
Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RequirementImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RequirementImpl.java?rev=916766&r1=916765&r2=916766&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RequirementImpl.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/RequirementImpl.java Fri Feb 26 17:25:58 2010
@@ -71,7 +71,7 @@
public synchronized boolean isSatisfied(Capability capability)
{
- return m_filter.matchCase(capability.getProperties());
+ return m_name.equals(capability.getName()) && m_filter.matchCase(capability.getProperties());
}
public synchronized boolean isExtend()
Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java?rev=916766&r1=916765&r2=916766&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResolverImpl.java Fri Feb 26 17:25:58 2010
@@ -340,8 +340,7 @@
Capability[] caps = resource.getCapabilities();
for (int capIdx = 0; (caps != null) && (capIdx < caps.length); capIdx++)
{
- if (caps[capIdx].getName().equals(req.getName())
- && req.isSatisfied(caps[capIdx]))
+ if (req.isSatisfied(caps[capIdx]))
{
// The requirement is already satisfied an existing
// resource, return the resource.
@@ -371,8 +370,7 @@
Capability[] caps = resources[resIdx].getCapabilities();
for (int capIdx = 0; (caps != null) && (capIdx < caps.length); capIdx++)
{
- if (caps[capIdx].getName().equals(req.getName())
- && req.isSatisfied(caps[capIdx]))
+ if (req.isSatisfied(caps[capIdx]))
{
matchingCapabilities.add(caps[capIdx]);
}