felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r907645 - in /felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl: Activator.java Configuration.java
Date Mon, 08 Feb 2010 12:56:48 GMT
Author: cziegeler
Date: Mon Feb  8 12:56:48 2010
New Revision: 907645

URL: http://svn.apache.org/viewvc?rev=907645&view=rev
Log:
Make sure to start the event admin before config admin can configure it.

Modified:
    felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Activator.java
    felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java

Modified: felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Activator.java?rev=907645&r1=907644&r2=907645&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Activator.java
(original)
+++ felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Activator.java
Mon Feb  8 12:56:48 2010
@@ -61,9 +61,8 @@
         // independent of the org.osgi.service.log package)
         LogWrapper.setContext(context);
 
+        // this creates the event admin and starts it
         m_config = new Configuration(context);
-
-        m_config.start();
     }
 
     /**

Modified: felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java?rev=907645&r1=907644&r2=907645&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
(original)
+++ felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
Mon Feb  8 12:56:48 2010
@@ -149,8 +149,9 @@
 
         // default configuration
         configure( null );
+        start();
 
-        // listen for Configuration Admin configuration
+        // check for Configuration Admin configuration
         try
         {
             Object service = new ManagedService()
@@ -176,7 +177,7 @@
             }
             Dictionary props = new Hashtable();
             props.put( Constants.SERVICE_PID, PID );
-            m_managedServiceReg = bundleContext.registerService( interfaceNames, service,
props );
+            m_managedServiceReg = m_bundleContext.registerService( interfaceNames, service,
props );
         }
         catch ( Throwable t )
         {



Mime
View raw message