felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1487635 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
Date Wed, 29 May 2013 20:42:44 GMT
Author: djencks
Date: Wed May 29 20:42:43 2013
New Revision: 1487635

URL: http://svn.apache.org/r1487635
Log:
FELIX-4088 Fix NPE on concurrent configuration deletion/bundle stop

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java?rev=1487635&r1=1487634&r2=1487635&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
Wed May 29 20:42:43 2013
@@ -108,6 +108,10 @@ public class ConfigurationSupport implem
         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);



Mime
View raw message