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 111127ADD for ; Fri, 30 Sep 2011 17:38:15 +0000 (UTC) Received: (qmail 2426 invoked by uid 500); 30 Sep 2011 17:38:15 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 2322 invoked by uid 500); 30 Sep 2011 17:38:14 -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 2309 invoked by uid 99); 30 Sep 2011 17:38:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Sep 2011 17:38:14 +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; Fri, 30 Sep 2011 17:38:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 95CA223888EA for ; Fri, 30 Sep 2011 17:37:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1177749 - in /felix/trunk/framework/src/main/java/org/apache/felix/framework: StatefulResolver.java resolver/Candidates.java Date: Fri, 30 Sep 2011 17:37:49 -0000 To: commits@felix.apache.org From: rickhall@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110930173749.95CA223888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rickhall Date: Fri Sep 30 17:37:49 2011 New Revision: 1177749 URL: http://svn.apache.org/viewvc?rev=1177749&view=rev Log: Framework should filter removal-pending revisions for fragments, not the resolver. (FELIX-3141) Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java?rev=1177749&r1=1177748&r2=1177749&view=diff ============================================================================== --- felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java (original) +++ felix/trunk/framework/src/main/java/org/apache/felix/framework/StatefulResolver.java Fri Sep 30 17:37:49 2011 @@ -1021,7 +1021,19 @@ class StatefulResolver synchronized Set getFragments() { - return new HashSet(m_fragments); + Set fragments = new HashSet(m_fragments); + // Filter out any fragments that are not the current revision. + for (Iterator it = fragments.iterator(); it.hasNext(); ) + { + BundleRevision fragment = it.next(); + BundleRevision currentFragmentRevision = + fragment.getBundle().adapt(BundleRevision.class); + if (fragment != currentFragmentRevision) + { + it.remove(); + } + } + return fragments; } synchronized boolean isSelectedSingleton(BundleRevision br) @@ -1278,12 +1290,16 @@ class StatefulResolver // Find the matching candidates. Set matches = capSet.match(sf, obeyMandatory); + // Filter matching candidates. for (BundleCapability cap : matches) { + // Filter according to security. if (filteredBySecurity(req, cap)) { continue; } + // Filter already resolved hosts, since we don't support + // dynamic attachment of fragments. if (req.getNamespace().equals(BundleRevision.HOST_NAMESPACE) && (cap.getRevision().getWiring() != null)) { @@ -1331,7 +1347,8 @@ class StatefulResolver return result; } - private boolean filteredBySecurity(BundleRequirement req, BundleCapability cap) { + private boolean filteredBySecurity(BundleRequirement req, BundleCapability cap) + { if (System.getSecurityManager() != null) { BundleRevisionImpl reqRevision = (BundleRevisionImpl) req.getRevision(); Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java?rev=1177749&r1=1177748&r2=1177749&view=diff ============================================================================== --- felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java (original) +++ felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java Fri Sep 30 17:37:49 2011 @@ -646,14 +646,10 @@ class Candidates { for (BundleRequirement hostReq : versionEntry.getValue()) { - // Select the highest version of the fragment that - // is not removal pending. If the fragment revision - // is removal pending, then its current revision will - // be null or won't match the existing revision. - BundleRevision currentFragmentRevision = - hostReq.getRevision().getBundle() - .adapt(BundleRevision.class); - if (isFirst && (currentFragmentRevision == hostReq.getRevision())) + // Selecting the first fragment in each entry, which + // is equivalent to selecting the highest version of + // each fragment with a given symbolic name. + if (isFirst) { selectedFragments.add(hostReq.getRevision()); isFirst = false;