| commit | 68b5ac6f1d067c2e5a255a3fd536f91b82d3c3a1 | [log] [tgz] |
|---|---|---|
| author | David Jencks <djencks@apache.org> | Wed May 29 20:42:43 2013 +0000 |
| committer | David Jencks <djencks@apache.org> | Wed May 29 20:42:43 2013 +0000 |
| tree | d60dd3d17c44f35efa9fab0bb85cf056e577327e | |
| parent | c8a011116a6a73aaf4ca10210eec634c719ae6a1 [diff] |
FELIX-4088 Fix NPE on concurrent configuration deletion/bundle stop git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1487635 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java b/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java index 309bdee..4492cb4 100644 --- a/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java +++ b/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
@@ -108,6 +108,10 @@ if (!holder.getComponentMetadata().isConfigurationIgnored()) { final BundleContext bundleContext = holder.getActivator().getBundleContext(); + if ( bundleContext == null ) + { + return;// bundle was stopped concurrently with configuration deletion + } final String confPid = holder.getComponentMetadata().getConfigurationPid(); final ServiceReference caRef = bundleContext.getServiceReference(ComponentRegistry.CONFIGURATION_ADMIN);