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

[ri...@apache.org]

Author: rickhall
Date: Mon Apr 26 13:32:30 2010
New Revision: 938038

URL: http://svn.apache.org/viewvc?rev=938038&view=rev
Log:
Avoid checking for dynamic imports, if not needed. (FELIX-2035)

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java?rev=938038&r1=938037&r2=938038&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java Mon Apr 26 13:32:30 2010
@@ -250,6 +250,14 @@ public class ResolverImpl implements Res
             return null;
         }
 
+        // If the module doesn't have dynamic imports, then just return
+        // immediately.
+        List<Requirement> dynamics = module.getDynamicRequirements();
+        if ((dynamics == null) || (dynamics.size() == 0))
+        {
+            return null;
+        }
+
         // If any of the module exports this package, then we cannot
         // attempt to dynamically import it.
         List<Capability> caps = module.getCapabilities();
@@ -281,7 +289,6 @@ public class ResolverImpl implements Res
         Requirement req = new RequirementImpl(
             module, Capability.PACKAGE_NAMESPACE, dirs, attrs);
         Set<Capability> candidates = state.getCandidates(module, req, false);
-        List<Requirement> dynamics = module.getDynamicRequirements();
 
         // First find a dynamic requirement that matches the capabilities.
         Requirement dynReq = null;
@@ -1636,4 +1643,4 @@ System.out.println("RE: Candidate not re
                 && m_cap.equals(((Blame) o).m_cap);
         }
     }
-}
\ No newline at end of file
+}