FELIX-6180: committed the patch provided by Bram in order to log component init errors to the log service instead of stdout (thanks Bram)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1866811 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
index 436bf46..133bfbb 100644
--- a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd
@@ -34,7 +34,7 @@
Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt
Import-Package: !org.junit,!org.mockito.*,org.osgi.framework;version="[1.8, 2)",*
Bundle-Activator: org.apache.felix.dm.impl.Activator
-Bundle-Version: 4.6.0
+Bundle-Version: 4.6.1
Bundle-Name: Apache Felix Dependency Manager
Bundle-Description: Provides dynamic service and component dependency management
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
diff --git a/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java b/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
index d699474..5a44379 100644
--- a/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
+++ b/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
@@ -100,7 +100,7 @@
*
* @see @link {@link ComponentExecutorFactory}
*/
- private volatile Executor m_executor = new SerialExecutor(new Logger(null));
+ private volatile Executor m_executor;
/**
* The current state of the component state machine.
@@ -418,6 +418,7 @@
m_bundle = context != null ? context.getBundle() : null;
m_manager = manager;
m_logger = logger;
+ m_executor = new SerialExecutor(m_logger);
m_autoConfig.put(BundleContext.class, Boolean.TRUE);
m_autoConfig.put(ServiceRegistration.class, Boolean.TRUE);
m_autoConfig.put(DependencyManager.class, Boolean.TRUE);