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

[gn...@apache.org]

Author: gnodet
Date: Mon Jul 13 15:18:12 2015
New Revision: 1690715

URL: http://svn.apache.org/r1690715
Log:
[FELIX-4942] Avoid the creation of an intermediary list

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=1690715&r1=1690714&r2=1690715&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:12 2015
@@ -671,9 +671,12 @@ public class ResolverImpl implements Res
             // the dynamic import is added here last to the parallel reqs/caps
             // list is used later when checking to see if the package being
             // dynamically imported shadows an existing provider.
-            for (Requirement req
-                : Util.getDynamicRequirements(wiring.getResourceRequirements(null)))
+            for (Requirement req : wiring.getResourceRequirements(null))
             {
+                if (!Util.isDynamic(req))
+                {
+                    continue;
+                }
                 // Get the candidates for the current requirement.
                 List<Capability> candCaps = allCandidates.getCandidates(req);
                 // Optional requirements may not have any candidates.