commit 41c5e2b259524450cc6d663a99c8ebdce3190d36
author Richard S. Hall <rickhall@apache.org> Mon Aug 01 18:16:09 2011 +0000
committer Richard S. Hall <rickhall@apache.org> Mon Aug 01 18:16:09 2011 +0000
tree af32e781a01db7116f98f4e0e3b1467b762be570
parent 27113c6795da40b070f9e564f435138a7df4de9f

Missed one dynamic constants. (FELIX-2950)


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

framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java

diff --git a/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java b/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
index 021848a..9cad608 100644
--- a/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
@@ -31,6 +31,7 @@
 import org.apache.felix.framework.BundleWiringImpl;
 import org.apache.felix.framework.Logger;
 import org.apache.felix.framework.capabilityset.CapabilitySet;
+import org.apache.felix.framework.util.FelixConstants;
 import org.apache.felix.framework.util.Util;
 import org.apache.felix.framework.wiring.BundleCapabilityImpl;
 import org.apache.felix.framework.wiring.BundleRequirementImpl;
@@ -693,8 +694,8 @@
             for (BundleRequirement req : revision.getDeclaredRequirements(null))
             {
                 String resolution = req.getDirectives().get(Constants.RESOLUTION_DIRECTIVE);
-// TODO: OSGi R4.3 - Use proper "dynamic" constant.
-                if ((resolution == null) || !resolution.equals("dynamic"))
+                if ((resolution == null)
+                    || !resolution.equals(FelixConstants.RESOLUTION_DYNAMIC))
                 {
                     // Get the candidates for the current requirement.
                     SortedSet<BundleCapability> candCaps =