1 files changed, 3 insertions, 1 deletions

diff --git a/framework/src/onos/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistenceManager.java b/framework/src/onos/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistenceManager.java
index 64a8683a..3428bce1 100644
--- a/framework/src/onos/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistenceManager.java
+++ b/framework/src/onos/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistenceManager.java
@@ -60,12 +60,13 @@ public class PersistenceManager implements PersistenceService {
 
     private static final int FLUSH_FREQUENCY_MILLIS = 3000;
 
-    private final Timer timer = new Timer();
+    private Timer timer;
 
     private final CommitTask commitTask = new CommitTask();
 
     @Activate
     public void activate() {
+        timer = new Timer();
         Path dbPath = Paths.get(DATABASE_PATH);
         Path dbFolderPath = Paths.get(ENCLOSING_FOLDER);
         //Make sure the directory exists, if it does not, make it.
@@ -96,6 +97,7 @@ public class PersistenceManager implements PersistenceService {
 
     @Deactivate
     public void deactivate() {
+        timer.cancel();
         for (Map.Entry<String, Object> entry : localDB.getAll().entrySet()) {
             String key = entry.getKey();
             Object value = entry.getValue();