From d215ba8c8b69dead95177f964cd9db4605f8066f Mon Sep 17 00:00:00 2001 From: swarwick Date: Wed, 11 Mar 2015 11:28:58 -0400 Subject: [PATCH] More checking of the delete of the mapdb file Lots of issues I guess with deleting temp files for mapdb --- .../spi/persistence/MapDBPersistentStore.java | 1 + .../moquette/spi/impl/MapDBPersistentStoreTest.java | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java b/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java index 4fd2b11c..b8670f3b 100644 --- a/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java +++ b/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java @@ -24,6 +24,7 @@ import org.eclipse.moquette.spi.impl.events.PublishEvent; import org.eclipse.moquette.spi.impl.storage.StoredPublishEvent; import org.eclipse.moquette.spi.impl.subscriptions.Subscription; import org.eclipse.moquette.proto.messages.AbstractMessage; + import static org.eclipse.moquette.spi.impl.Utils.defaultGet; import org.mapdb.DB; diff --git a/broker/src/test/java/org/eclipse/moquette/spi/impl/MapDBPersistentStoreTest.java b/broker/src/test/java/org/eclipse/moquette/spi/impl/MapDBPersistentStoreTest.java index 857bd5c2..e20b5bda 100644 --- a/broker/src/test/java/org/eclipse/moquette/spi/impl/MapDBPersistentStoreTest.java +++ b/broker/src/test/java/org/eclipse/moquette/spi/impl/MapDBPersistentStoreTest.java @@ -17,6 +17,7 @@ package org.eclipse.moquette.spi.impl; import java.io.File; import java.util.List; + import org.eclipse.moquette.spi.impl.subscriptions.Subscription; import org.eclipse.moquette.spi.persistence.MapDBPersistentStore; import org.eclipse.moquette.proto.messages.AbstractMessage; @@ -38,10 +39,10 @@ public class MapDBPersistentStoreTest { @Before public void setUp() throws Exception { - File dbFile = new File(org.eclipse.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME); - assertFalse(String.format("The DB storagefile %s already exists", org.eclipse.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME), dbFile.exists()); + File dbFile = new File(org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH); + assertFalse(String.format("The DB storagefile %s already exists", org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH), dbFile.exists()); - m_storageService = new MapDBPersistentStore(org.eclipse.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME); + m_storageService = new MapDBPersistentStore(org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH); m_storageService.initStore(); } @@ -51,9 +52,9 @@ public class MapDBPersistentStoreTest { m_storageService.close(); } - File dbFile = new File(org.eclipse.moquette.commons.Constants.DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME); + File dbFile = new File(org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH); if (dbFile.exists()) { - dbFile.delete(); + assertTrue("Error deleting the moquette db file " + org.eclipse.moquette.commons.Constants.DEFAULT_PERSISTENT_PATH, dbFile.delete()); } assertFalse(dbFile.exists()); }