commit 18162fdf5936bddfad1f7c27531de49a48aec170
author Guillaume Nodet <gnodet@apache.org> Mon Jul 13 15:18:38 2015 +0000
committer Guillaume Nodet <gnodet@apache.org> Mon Jul 13 15:18:38 2015 +0000
tree 1846ee141eabada2e06d20fc0287f085371fc3ff
parent e51ed89f25ee19eba62274f3c9a0ba1350fbc3d9

[FELIX-4942] The test is already done in mergeUses

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1690721 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 ce55acb..70d890d 100644
--- a/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
+++ b/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
@@ -810,22 +810,18 @@
             {
                 for (Blame blame : blames)
                 {
-                    // Ignore resources that import from themselves.
-                    if (!blame.m_cap.getResource().equals(resource))
-                    {
-                        List<Requirement> blameReqs =
-                            Collections.singletonList(blame.m_reqs.get(0));
+                    List<Requirement> blameReqs =
+                        Collections.singletonList(blame.m_reqs.get(0));
 
-                        mergeUses(
-                            session,
-                            resource,
-                            resourcePkgs,
-                            blame.m_cap,
-                            blameReqs,
-                            null,
-                            resourcePkgMap,
-                            usesCycleMap);
-                    }
+                    mergeUses(
+                        session,
+                        resource,
+                        resourcePkgs,
+                        blame.m_cap,
+                        blameReqs,
+                        null,
+                        resourcePkgMap,
+                        usesCycleMap);
                 }
             }
             // Merge uses constraints from required bundles.