You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2019/07/26 05:37:59 UTC
svn commit: r1863771 - in /felix/trunk/configadmin: changelog.txt
src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
Author: cziegeler
Date: Fri Jul 26 05:37:59 2019
New Revision: 1863771
URL: http://svn.apache.org/viewvc?rev=1863771&view=rev
Log:
FELIX-6162 : ConfigurationManager crashes on shutdown if PersistenceManager not yet available
Modified:
felix/trunk/configadmin/changelog.txt
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
Modified: felix/trunk/configadmin/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/changelog.txt?rev=1863771&r1=1863770&r2=1863771&view=diff
==============================================================================
--- felix/trunk/configadmin/changelog.txt (original)
+++ felix/trunk/configadmin/changelog.txt Fri Jul 26 05:37:59 2019
@@ -1,3 +1,9 @@
+Changes in 1.9.18
+-----------------
+** Bug
+ * [FELIX-6162] : ConfigurationManager crashes on shutdown if PersistenceManager not yet available
+
+
Changes in 1.9.16
-----------------
** New Feature
Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java?rev=1863771&r1=1863770&r2=1863771&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java (original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java Fri Jul 26 05:37:59 2019
@@ -219,8 +219,12 @@ public class ConfigurationManager implem
handleBundleEvents = false;
// stop handling ManagedService[Factory] services
- managedServiceFactoryTracker.close();
- managedServiceTracker.close();
+ if (managedServiceFactoryTracker != null) {
+ managedServiceFactoryTracker.close();
+ }
+ if (managedServiceTracker != null) {
+ managedServiceTracker.close();
+ }
// stop queue processing before unregistering the service
// see FELIX-2813 for details