svn commit: r895756 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java

[rickhall]

Author: rickhall
Date: Mon Jan  4 19:50:54 2010
New Revision: 895756

URL: http://svn.apache.org/viewvc?rev=895756&view=rev
Log:
Minor code simplification.

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

Modified: 
felix/trunk/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java?rev=895756&r1=895755&r2=895756&view=diff
==============================================================================
--- 
felix/trunk/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java
 (original)
+++ 
felix/trunk/framework/src/main/java/org/apache/felix/framework/FelixResolverState.java
 Mon Jan  4 19:50:54 2010
@@ -361,9 +361,8 @@
             reqs = fragment.getRequirements();
             Map ipFragment = new HashMap();
             Map rbFragment = new HashMap();
-            boolean conflicting = false;
             for (int reqIdx = 0;
-                !conflicting && (reqs != null) && (reqIdx < reqs.length);
+                (reqs != null) && (reqIdx < reqs.length);
                 reqIdx++)
             {
                 if 
(reqs[reqIdx].getNamespace().equals(ICapability.PACKAGE_NAMESPACE)
@@ -384,10 +383,6 @@
                     else if (isRequirementConflicting(
                         (Requirement) existing[REQ_IDX], (Requirement) 
reqs[reqIdx]))
                     {
-                        conflicting = true;
-                    }
-                    if (conflicting)
-                    {
                         ipFragment.clear();
                         rbFragment.clear();
                         it.remove();
@@ -400,6 +395,8 @@
                                 ? "imported package " : "required bundle ")
                             + targetName + " from "
                             + ((IModule) 
existing[MODULE_IDX]).getSymbolicName());
+                        // No need to finish processing current fragment.
+                        break;
                     }
                 }
             }