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/08/20 21:35:54 UTC
svn commit: r1696846 -
/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java
Author: gnodet
Date: Thu Aug 20 19:35:53 2015
New Revision: 1696846
URL: http://svn.apache.org/r1696846
Log:
[FELIX-4987] Make sure we don’t consider fragments for package consistency checking during dynamic resolution
Modified:
felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java
Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java
URL: http://svn.apache.org/viewvc/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java?rev=1696846&r1=1696845&r2=1696846&view=diff
==============================================================================
--- felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java (original)
+++ felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java Thu Aug 20 19:35:53 2015
@@ -132,7 +132,10 @@ class Candidates
{
res = ((WrappedResource) res).getDeclaredResource();
}
- hosts.put(res, getWrappedHost(res));
+ if (!Util.isFragment(res))
+ {
+ hosts.put(res, getWrappedHost(res));
+ }
}
for (Capability cap : m_dependentMap.keySet())
{
@@ -141,7 +144,10 @@ class Candidates
{
res = ((WrappedResource) res).getDeclaredResource();
}
- hosts.put(res, getWrappedHost(res));
+ if (!Util.isFragment(res))
+ {
+ hosts.put(res, getWrappedHost(res));
+ }
}
return hosts;
}