You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2015/07/13 17:18:38 UTC
svn commit: r1690721 -
/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
Author: gnodet
Date: Mon Jul 13 15:18:38 2015
New Revision: 1690721
URL: http://svn.apache.org/r1690721
Log:
[FELIX-4942] The test is already done in mergeUses
Modified:
felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java?rev=1690721&r1=1690720&r2=1690721&view=diff
==============================================================================
--- felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java (original)
+++ felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java Mon Jul 13 15:18:38 2015
@@ -810,22 +810,18 @@ public class ResolverImpl implements Res
{
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.