felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chet...@apache.org
Subject svn commit: r1779591 - in /felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal: Activator.java Logger.java
Date Fri, 20 Jan 2017 09:37:40 GMT
Author: chetanm
Date: Fri Jan 20 09:37:40 2017
New Revision: 1779591

URL: http://svn.apache.org/viewvc?rev=1779591&view=rev
Log:
FELIX-5502 - Startup logs from ConfigSpiOsgi may get dropped due to race condition

Ensure that Logger tracker is opened before it is passed to other classes

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

Modified: felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/Activator.java?rev=1779591&r1=1779590&r2=1779591&view=diff
==============================================================================
--- felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/Activator.java (original)
+++ felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/Activator.java Fri Jan 20
09:37:40 2017
@@ -34,7 +34,6 @@ public class Activator implements Bundle
     private BundleLoginModuleCreator loginModuleCreator;
     private JaasConfigFactory jaasConfigFactory;
     private ConfigSpiOsgi configSpi;
-    private JaasWebConsolePlugin webConsolePlugin;
     private Logger logger;
 
     @Override
@@ -46,7 +45,6 @@ public class Activator implements Bundle
         configSpi = new ConfigSpiOsgi(context, logger);
         registerWebConsolePlugin(context);
 
-        logger.open();
         loginModuleCreator.open();
         configSpi.open();
     }

Modified: felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/Logger.java
URL: http://svn.apache.org/viewvc/felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/Logger.java?rev=1779591&r1=1779590&r2=1779591&view=diff
==============================================================================
--- felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/Logger.java (original)
+++ felix/trunk/jaas/src/main/java/org/apache/felix/jaas/internal/Logger.java Fri Jan 20 09:37:40
2017
@@ -29,6 +29,7 @@ class Logger extends ServiceTracker
     public Logger(BundleContext context)
     {
         super(context, LogService.class.getName(), null);
+        open();
     }
 
     public void log(int level, String message)



Mime
View raw message