commit 2305d27f1f4ff9efd06f59265f026e031d5a9b78
author Guillaume Nodet <gnodet@apache.org> Mon Jul 13 15:18:19 2015 +0000
committer Guillaume Nodet <gnodet@apache.org> Mon Jul 13 15:18:19 2015 +0000
tree f1993a2f49dab689e3e9f9724f1cefcfab34c6ef
parent 657a829030242a66662d7e2b5d110a9cbdf65063

[FELIX-4942] Reuse the Util.isDynamic method

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

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

diff --git a/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java b/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
index 928e8b8..03f56eb 100644
--- a/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
+++ b/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
@@ -644,11 +644,7 @@
                 // matching dynamic imports.
                 Requirement r = wire.getRequirement();
                 if (!r.getResource().equals(wire.getRequirer())
-                    || ((r.getDirectives()
-                    .get(PackageNamespace.REQUIREMENT_RESOLUTION_DIRECTIVE) != null)
-                    && r.getDirectives()
-                    .get(PackageNamespace.REQUIREMENT_RESOLUTION_DIRECTIVE)
-                    .equals(PackageNamespace.RESOLUTION_DYNAMIC)))
+                    || Util.isDynamic(r))
                 {
                     r = new WrappedRequirement(wire.getRequirer(), r);
                 }