felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1558623 - /felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/ConfigSpiOsgi.java
Date Thu, 16 Jan 2014 00:24:11 GMT
Author: fmeschbe
Date: Thu Jan 16 00:24:11 2014
New Revision: 1558623

URL: http://svn.apache.org/r1558623
Log:
FELIX-4387 Get configuration early in the constructor before registering
   services to make sure to get proper updates.
   (Thanks Tobias Bocanegra for providing the patch)

Modified:
    felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/ConfigSpiOsgi.java

Modified: felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/ConfigSpiOsgi.java
URL: http://svn.apache.org/viewvc/felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/ConfigSpiOsgi.java?rev=1558623&r1=1558622&r2=1558623&view=diff
==============================================================================
--- felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/ConfigSpiOsgi.java (original)
+++ felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/ConfigSpiOsgi.java Thu Jan
16 00:24:11 2014
@@ -117,6 +117,8 @@ public class ConfigSpiOsgi extends Confi
     public ConfigSpiOsgi(BundleContext context, Logger log) throws ConfigurationException
{
         this.context = context;
         this.log = log;
+        this.originalConfig = getGlobalConfiguration();
+        this.proxyConfig = new DelegatingConfiguration(osgiConfig, originalConfig);
 
         updated(getDefaultConfig());
         this.tracker = new ServiceTracker(context, LoginModuleFactory.class.getName(),
@@ -131,9 +133,6 @@ public class ConfigSpiOsgi extends Confi
         //TODO Should this registration be made conditional i.e. service is only registered
         //only if there active LoginModules present
         this.context.registerService(LoginContextFactory.class.getName(), this, new Properties());
-
-        this.originalConfig = getGlobalConfiguration();
-        this.proxyConfig = new DelegatingConfiguration(osgiConfig, originalConfig);
     }
 
     @Override



Mime
View raw message