Make sure to start the event admin before config admin can configure it.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@907645 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Activator.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Activator.java
index 8277851..7bb3906 100644
--- a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Activator.java
+++ b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Activator.java
@@ -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();
}
/**
diff --git a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
index a193042..34ac45c 100644
--- a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
+++ b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
@@ -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 )
{