Cancelling timer at close to prevent attempts to commit closed DB.
Change-Id: I01d2984e69ea8329c06a6fc3610d4a419f9bd6a2
diff --git a/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistenceManager.java b/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistenceManager.java
index 64a8683..3428bce 100644
--- a/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistenceManager.java
+++ b/core/store/persistence/src/main/java/org/onosproject/persistence/impl/PersistenceManager.java
@@ -60,12 +60,13 @@
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 @@
@Deactivate
public void deactivate() {
+ timer.cancel();
for (Map.Entry<String, Object> entry : localDB.getAll().entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();