Author: cziegeler
Date: Thu Feb 15 07:33:02 2018
New Revision: 1824285

URL: http://svn.apache.org/viewvc?rev=1824285&view=rev
Log:
FELIX-5351 : Close tracker before setting configurationmanager to null 
(avoiding NPE on shutdown)

Modified:
    
felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/PersistenceManagerTracker.java

Modified: 
felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/PersistenceManagerTracker.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/PersistenceManagerTracker.java?rev=1824285&r1=1824284&r2=1824285&view=diff
==============================================================================
--- 
felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/PersistenceManagerTracker.java
 (original)
+++ 
felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/persistence/PersistenceManagerTracker.java
 Thu Feb 15 07:33:02 2018
@@ -125,12 +125,12 @@ public class PersistenceManagerTracker
 
     private void deactivate()
     {
+        this.stopCoordinatorTracker();
         if ( this.configurationManager != null )
         {
             this.configurationManager.stop();
             this.configurationManager = null;
         }
-        this.stopCoordinatorTracker();
         // update log
         Log.logger.set(null);
     }


Reply via email to