Author: rickhall
Date: Tue Dec 8 16:36:20 2009
New Revision: 888474
URL: http://svn.apache.org/viewvc?rev=888474&view=rev
Log:
Minor edit.
Modified:
felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/prototype/ProtoResolver.java
Modified:
felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/prototype/ProtoResolver.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/prototype/ProtoResolver.java?rev=888474&r1=888473&r2=888474&view=diff
==============================================================================
---
felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/prototype/ProtoResolver.java
(original)
+++
felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/prototype/ProtoResolver.java
Tue Dec 8 16:36:20 2009
@@ -121,10 +121,6 @@
// If the module is already resolved, then do nothing.
if (!module.isResolved())
{
- // Copy the existing constraints, since we need to be able
- // to freely modify them.
- Map<String, Blame> existingConstraints = new HashMap<String,
Blame>();
-
// Add the module to the cycle map; use Boolean.FALSE to
// mark it as in the process of being resolved.
Map<Module, Boolean> cycleMap = new HashMap<Module, Boolean>();
@@ -262,6 +258,10 @@
// every import, so we need to merge the calculated constraints
// with the existing constraints, checking the consistency
// while we do it.
+
+ // Since this is the root, there are no existing constraints,
so
+ // create an empty map.
+ Map<String, Blame> existingConstraints = new HashMap<String,
Blame>();
//System.out.println("+++ existingConstraints: " + existingConstraintsCopy);
//System.out.println("+++ currentConstraints : " + currentConstraints);
checkConsistency(
