commit 9d9763dbaf931030070ae0af657f86cbea3bb056
author Felix Meschberger <fmeschbe@apache.org> Fri Aug 06 07:09:30 2010 +0000
committer Felix Meschberger <fmeschbe@apache.org> Fri Aug 06 07:09:30 2010 +0000
tree 5371ac48ede7e04578ec1e22491911aece84ccda
parent 8fc7e520c5160dbafa3036e0d6bb6cee2b5ca15b

FELIX-2526 change order of tests (the location binding test will succeed more often than the CT workaround test)

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@982893 13f79535-47bb-0310-9956-ffa450edef68

scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationComponentRegistry.java

diff --git a/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationComponentRegistry.java b/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationComponentRegistry.java
index 069cf82..64067be 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationComponentRegistry.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationComponentRegistry.java
@@ -303,7 +303,7 @@
         try
         {
             final Configuration cfg = ca.getConfiguration( pid );
-            if ( Activator.hasCtWorkaround() || bundleLocation.equals( cfg.getBundleLocation() ) )
+            if ( bundleLocation.equals( cfg.getBundleLocation() ) || Activator.hasCtWorkaround() )
             {
                 return cfg.getProperties();
             }