From 5e30dc5bf43705a081369bc3fd14a4d4c3d5ce60 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 25 Feb 2021 17:34:03 +0000 Subject: [PATCH] Simplify deadline comparison logic. --- .../bramble/cleanup/CleanupManagerImpl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java index da381cf60..12bc4e00b 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java @@ -95,15 +95,12 @@ class CleanupManagerImpl implements CleanupManager, Service, EventListener { private void maybeScheduleTask(long deadline) { synchronized (lock) { - long minDeadline = Long.MAX_VALUE; for (CleanupTask task : pending) { - if (task.deadline < minDeadline) minDeadline = task.deadline; - } - if (deadline < minDeadline) { - CleanupTask task = new CleanupTask(deadline); - pending.add(task); - scheduleTask(task); + if (task.deadline <= deadline) return; } + CleanupTask task = new CleanupTask(deadline); + pending.add(task); + scheduleTask(task); } }