| commit | 85fc8f02a6f25263d9709feec1869816015efbe9 | [log] [tgz] |
|---|---|---|
| author | Pierre De Rop <pderop@apache.org> | Mon Jul 27 21:50:09 2015 +0000 |
| committer | Pierre De Rop <pderop@apache.org> | Mon Jul 27 21:50:09 2015 +0000 |
| tree | bd380e1794eed8da644eee15a095983c23683c14 | |
| parent | d3723d8f6e72907b8a435755c83238183735cd38 [diff] |
FELIX-4974: DM filter indices are not enabled if the dependencymanager bundle is started before any other bundles that contain a DM Activator. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1692960 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/DependencyManager.java b/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/DependencyManager.java index 9b0a541..7074ef3 100644 --- a/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/DependencyManager.java +++ b/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/DependencyManager.java
@@ -80,8 +80,10 @@ static { try { Bundle bundle = FrameworkUtil.getBundle(DependencyManager.class); - if (bundle != null && bundle.getState() != Bundle.ACTIVE) { - bundle.start(); + if (bundle != null) { + if (bundle.getState() != Bundle.ACTIVE) { + bundle.start(); + } BundleContext bundleContext = bundle.getBundleContext(); String index = bundleContext.getProperty(SERVICEREGISTRY_CACHE_INDICES); if (index != null) {