From e63291850fd0795c5700e25e67e5dee89ba54c5f Mon Sep 17 00:00:00 2001 From: Ashlee Young Date: Tue, 1 Dec 2015 05:49:27 -0800 Subject: onos commit hash c2999f30c69e50df905a9d175ef80b3f23a98514 Change-Id: I2bb8562c4942b6d6a6d60b663db2e17540477b81 Signed-off-by: Ashlee Young --- .../java/org/onosproject/persistence/impl/PersistenceManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'framework/src/onos/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistenceManager.java') 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 entry : localDB.getAll().entrySet()) { String key = entry.getKey(); Object value = entry.getValue(); -- cgit 1.2.3-korg