felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
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 GMT
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();
             }



Mime
View raw message