Author: rickhall
Date: Fri Apr 13 19:54:42 2012
New Revision: 1325928
URL: http://svn.apache.org/viewvc?rev=1325928&view=rev
Log:
Fix bug in Util.isOptional().
Modified:
felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Util.java
Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Util.java
URL:
http://svn.apache.org/viewvc/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Util.java?rev=1325928&r1=1325927&r2=1325928&view=diff
==============================================================================
--- felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Util.java
(original)
+++ felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Util.java Fri
Apr 13 19:54:42 2012
@@ -75,8 +75,7 @@ public class Util
public static boolean isOptional(Requirement req)
{
String resolution =
req.getDirectives().get(Namespace.REQUIREMENT_RESOLUTION_DIRECTIVE);
- return ((resolution == null)
- || resolution.equalsIgnoreCase(Namespace.RESOLUTION_OPTIONAL));
+ return Namespace.RESOLUTION_OPTIONAL.equalsIgnoreCase(resolution);
}
public static List<Requirement> getDynamicRequirements(List<Requirement>
reqs)
