svn commit: r1690718 - /felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java

[gnodet]

Author: gnodet
Date: Mon Jul 13 15:18:25 2015
New Revision: 1690718

URL: http://svn.apache.org/r1690718
Log:
[FELIX-4942] Use getFirstCandidate method

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=1690718&r1=1690717&r2=1690718&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:25 2015
@@ -673,15 +673,13 @@ public class ResolverImpl implements Res
                 {
                     continue;
                 }
-                // Get the candidates for the current requirement.
-                List<Capability> candCaps = allCandidates.getCandidates(req);
+                // Grab first (i.e., highest priority) candidate.
+                Capability cap = allCandidates.getFirstCandidate(req);
                 // Optional requirements may not have any candidates.
-                if (candCaps == null)
+                if (cap == null)
                 {
                     continue;
                 }
-                // Grab first (i.e., highest priority) candidate.
-                Capability cap = candCaps.get(0);
                 reqs.add(req);
                 caps.add(cap);
                 isDynamicImporting = true;