svn commit: r1680878 - /felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java

[ri...@apache.org]

Author: rickhall
Date: Thu May 21 13:57:01 2015
New Revision: 1680878

URL: http://svn.apache.org/r1680878
Log:
Apply patch (FELIX-4897) to make sure fragment dynamic candidates are
properly inserted into the candidates list.

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=1680878&r1=1680877&r2=1680878&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 May 21 13:57:01 2015
@@ -589,13 +589,15 @@ class Candidates
         // as a mandatory revision.
         m_mandatoryResources.add(resource);
 
-        // Add the dynamic imports candidates.
-        add(req, candidates);
-
         // Process the candidates, removing any candidates that
         // cannot resolve.
         ResolutionException rethrow = processCandidates(rc, resource, candidates);
 
+        // Add the dynamic imports candidates.
+        // Make sure this is done after the call to processCandidates since we want to ensure
+        // fragment candidates are properly hosted before adding the candidates list which makes a copy
+        add(req, candidates);
+
         if (candidates.isEmpty())
         {
             if (rethrow == null)