From 8f839e2c308831246b82003af96756cb015b955b Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 12 Jun 2019 15:21:48 +0100 Subject: [PATCH] Remove temporary messages at startup. --- .../briarproject/bramble/lifecycle/LifecycleManagerImpl.java | 5 ++++- .../bramble/lifecycle/LifecycleManagerImplTest.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java index d749f616a..fc1259d2a 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/lifecycle/LifecycleManagerImpl.java @@ -107,8 +107,11 @@ class LifecycleManagerImpl implements LifecycleManager, MigrationListener { else logDuration(LOG, "Creating database", start); db.transaction(false, txn -> { + long start1 = now(); + db.removeTemporaryMessages(txn); + logDuration(LOG, "Removing temporary messages", start1); for (OpenDatabaseHook hook : openDatabaseHooks) { - long start1 = now(); + start1 = now(); hook.onDatabaseOpened(txn); if (LOG.isLoggable(FINE)) { logDuration(LOG, "Calling open database hook " diff --git a/bramble-core/src/test/java/org/briarproject/bramble/lifecycle/LifecycleManagerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/lifecycle/LifecycleManagerImplTest.java index ee6e4ae55..09ce697bf 100644 --- a/bramble-core/src/test/java/org/briarproject/bramble/lifecycle/LifecycleManagerImplTest.java +++ b/bramble-core/src/test/java/org/briarproject/bramble/lifecycle/LifecycleManagerImplTest.java @@ -42,6 +42,7 @@ public class LifecycleManagerImplTest extends BrambleMockTestCase { oneOf(db).open(dbKey, lifecycleManager); will(returnValue(false)); oneOf(db).transaction(with(false), withDbRunnable(txn)); + oneOf(db).removeTemporaryMessages(txn); allowing(eventBus).broadcast(with(any(LifecycleEvent.class))); }});