Author: rickhall
Date: Tue Jul 10 13:07:03 2007
New Revision: 555064
URL: http://svn.apache.org/viewvc?view=rev&rev=555064
Log:
Fixed a bug that was causing the resolver to match against invalid candidates.
This bug was introduced during the resolver refactoring for require-bundle.
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java
URL:
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java?view=diff&rev=555064&r1=555063&r2=555064
==============================================================================
---
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java
(original)
+++
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/Requirement.java
Tue Jul 10 13:07:03 2007
@@ -162,14 +162,6 @@
// Get current attribute from this import package.
R4Attribute reqAttr = m_attributes[reqAttrIdx];
- // Ignore version attribute, since it is a special case that
- // has already been compared using isVersionInRange() before
- // the call to this method was made.
- if (reqAttr.getName().equals(Constants.VERSION_ATTRIBUTE))
- {
- continue;
- }
-
// Check if the export package has the same attribute.
boolean found = false;
for (int capAttrIdx = 0;