felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r374615 - /incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
Date Fri, 03 Feb 2006 09:28:07 GMT
Author: rickhall
Date: Fri Feb  3 01:28:04 2006
New Revision: 374615

URL: http://svn.apache.org/viewcvs?rev=374615&view=rev
Log:
Fixed a bug where a "!" was dropped during refactoring.

Modified:
    incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java

Modified: incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java?rev=374615&r1=374614&r2=374615&view=diff
==============================================================================
--- incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
(original)
+++ incubator/felix/sandbox/rickhall/framework-branch/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
Fri Feb  3 01:28:04 2006
@@ -723,7 +723,7 @@
         {
             return;
         }
-    
+
         // This variable maps an unresolved module to a list of resolver
         // nodes, where there is one resolver node for each import that
         // must be resolved. A resolver node contains the potential
@@ -803,12 +803,11 @@
         {
             return;
         }
-
-        // Map to hold the bundle's import packages
+        // Map to hold the module's import packages
         // and their respective resolving candidates.
         List nodeList = new ArrayList();
 
-        // Even though the node list is currently emptry, we
+        // Even though the node list is currently empty, we
         // record it in the resolver map early so we can use
         // it to detect cycles.
         resolverMap.put(module, nodeList);
@@ -843,7 +842,7 @@
                     {
                         // Only populate the resolver map with modules that
                         // are not already resolved.
-                        if (isResolved(candidates[candIdx]))
+                        if (!isResolved(candidates[candIdx]))
                         {
                             populateResolverMap(resolverMap, candidates[candIdx]);
                         }
@@ -1025,6 +1024,7 @@
         // candidate's constraints to the existing constraints to check
         // for conflicts.
         List nodeList = (List) resolverMap.get(rootModule);
+System.out.println("CANDIDATES FOR " + rootModule + " ARE " + nodeList);
         for (int nodeIdx = 0; nodeIdx < nodeList.size(); nodeIdx++)
         {
             // Verify that the current candidate does not violate



Mime
View raw message