commit 97a0bc5943e7dde09b8e851d32f68423f9e57ef7
author Richard S. Hall <rickhall@apache.org> Fri Apr 13 19:54:42 2012 +0000
committer Richard S. Hall <rickhall@apache.org> Fri Apr 13 19:54:42 2012 +0000
tree 3a97ff4a8c96d55d57f3260232d891343cc73263
parent 042ba848bfb2ec89b60f5f1136068b09cc68f585

Fix bug in Util.isOptional().


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1325928 13f79535-47bb-0310-9956-ffa450edef68

resolver/src/main/java/org/apache/felix/resolver/Util.java

diff --git a/resolver/src/main/java/org/apache/felix/resolver/Util.java b/resolver/src/main/java/org/apache/felix/resolver/Util.java
index e9ab8e6..dc5a100 100644
--- a/resolver/src/main/java/org/apache/felix/resolver/Util.java
+++ b/resolver/src/main/java/org/apache/felix/resolver/Util.java
@@ -75,8 +75,7 @@
     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)