Author: pderop
Date: Mon Jul 27 21:52:58 2015
New Revision: 1692961
URL: http://svn.apache.org/r1692961
Log:
merged fix for FELIX-4974 from trunk.
Modified:
felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/src/org/apache/felix/dm/DependencyManager.java
Modified:
felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/src/org/apache/felix/dm/DependencyManager.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/src/org/apache/felix/dm/DependencyManager.java?rev=1692961&r1=1692960&r2=1692961&view=diff
==============================================================================
---
felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/src/org/apache/felix/dm/DependencyManager.java
(original)
+++
felix/sandbox/pderop/dependencymanager.ds/org.apache.felix.dependencymanager/src/org/apache/felix/dm/DependencyManager.java
Mon Jul 27 21:52:58 2015
@@ -80,8 +80,10 @@ public class DependencyManager {
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) {
