Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 19735 invoked from network); 6 Aug 2010 07:10:50 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Aug 2010 07:10:50 -0000 Received: (qmail 16085 invoked by uid 500); 6 Aug 2010 07:10:50 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 16042 invoked by uid 500); 6 Aug 2010 07:10:48 -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 16035 invoked by uid 99); 6 Aug 2010 07:10:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Aug 2010 07:10:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 06 Aug 2010 07:10:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5A25F23889BF; Fri, 6 Aug 2010 07:09:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r982893 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationComponentRegistry.java Date: Fri, 06 Aug 2010 07:09:31 -0000 To: commits@felix.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100806070931.5A25F23889BF@eris.apache.org> Author: fmeschbe Date: Fri Aug 6 07:09:30 2010 New Revision: 982893 URL: http://svn.apache.org/viewvc?rev=982893&view=rev Log: FELIX-2526 change order of tests (the location binding test will succeed more often than the CT workaround test) Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationComponentRegistry.java Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationComponentRegistry.java URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationComponentRegistry.java?rev=982893&r1=982892&r2=982893&view=diff ============================================================================== --- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationComponentRegistry.java (original) +++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationComponentRegistry.java Fri Aug 6 07:09:30 2010 @@ -303,7 +303,7 @@ public class ConfigurationComponentRegis try { final Configuration cfg = ca.getConfiguration( pid ); - if ( Activator.hasCtWorkaround() || bundleLocation.equals( cfg.getBundleLocation() ) ) + if ( bundleLocation.equals( cfg.getBundleLocation() ) || Activator.hasCtWorkaround() ) { return cfg.getProperties(); }