Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B12A99884 for ; Mon, 6 Feb 2012 22:45:25 +0000 (UTC) Received: (qmail 98993 invoked by uid 500); 6 Feb 2012 22:45:25 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 98566 invoked by uid 500); 6 Feb 2012 22:45:24 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 98501 invoked by uid 99); 6 Feb 2012 22:45:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Feb 2012 22:45:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Feb 2012 22:45:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D8B2623888E4 for ; Mon, 6 Feb 2012 22:45:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1241231 - /felix/sandbox/rickhall/obr-resolver/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java Date: Mon, 06 Feb 2012 22:45:02 -0000 To: commits@felix.apache.org From: rickhall@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120206224502.D8B2623888E4@eris.apache.org> Author: rickhall Date: Mon Feb 6 22:45:02 2012 New Revision: 1241231 URL: http://svn.apache.org/viewvc?rev=1241231&view=rev Log: Rename variable and fix potential bug in populateWireMap(). Modified: felix/sandbox/rickhall/obr-resolver/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java Modified: felix/sandbox/rickhall/obr-resolver/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/obr-resolver/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java?rev=1241231&r1=1241230&r2=1241231&view=diff ============================================================================== --- felix/sandbox/rickhall/obr-resolver/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java (original) +++ felix/sandbox/rickhall/obr-resolver/src/main/java/org/apache/felix/resolver/impl/ResolverImpl.java Mon Feb 6 22:45:02 2012 @@ -1409,14 +1409,14 @@ public class ResolverImpl implements Fel Map> wireMap, Candidates allCandidates) { - Resource unwrappedRevision = getActualResource(resource); - if (!env.getWirings().containsKey(resource) - && !wireMap.containsKey(unwrappedRevision)) + Resource unwrappedResource = getActualResource(resource); + if (!env.getWirings().containsKey(unwrappedResource) + && !wireMap.containsKey(unwrappedResource)) { - wireMap.put(unwrappedRevision, (List) Collections.EMPTY_LIST); + wireMap.put(unwrappedResource, (List) Collections.EMPTY_LIST); List packageWires = new ArrayList(); - List Wires = new ArrayList(); + List bundleWires = new ArrayList(); List capabilityWires = new ArrayList(); for (Requirement req : resource.getRequirements(null)) @@ -1435,7 +1435,7 @@ public class ResolverImpl implements Fel } Packages candPkgs = revisionPkgMap.get(cand.getResource()); Wire wire = new WireImpl( - unwrappedRevision, + unwrappedResource, getActualRequirement(req), getActualResource(cand.getResource()), getActualCapability(cand)); @@ -1445,7 +1445,7 @@ public class ResolverImpl implements Fel } else if (req.getNamespace().equals(ResourceConstants.WIRING_BUNDLE_NAMESPACE)) { - Wires.add(wire); + bundleWires.add(wire); } else { @@ -1456,9 +1456,9 @@ public class ResolverImpl implements Fel } // Combine package wires with require wires last. - packageWires.addAll(Wires); + packageWires.addAll(bundleWires); packageWires.addAll(capabilityWires); - wireMap.put(unwrappedRevision, packageWires); + wireMap.put(unwrappedResource, packageWires); // Add host wire for any fragments. if (resource instanceof HostResource) @@ -1477,8 +1477,8 @@ public class ResolverImpl implements Fel getActualResource(fragment), fragment.getRequirements( ResourceConstants.WIRING_HOST_NAMESPACE).get(0), - unwrappedRevision, - unwrappedRevision.getCapabilities( + unwrappedResource, + unwrappedResource.getCapabilities( ResourceConstants.WIRING_HOST_NAMESPACE).get(0))); } }