From 6bb57ebef4371459f8912a6d264d69431815d1f6 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 28 Dec 2020 13:55:59 -0800 Subject: Remove unnecessary code --- .../java/org/traccar/database/GroupsManager.java | 24 +--------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'src/main/java/org/traccar/database') diff --git a/src/main/java/org/traccar/database/GroupsManager.java b/src/main/java/org/traccar/database/GroupsManager.java index 81f1968aa..c35f35f93 100644 --- a/src/main/java/org/traccar/database/GroupsManager.java +++ b/src/main/java/org/traccar/database/GroupsManager.java @@ -19,24 +19,14 @@ package org.traccar.database; import java.sql.SQLException; import java.util.HashSet; import java.util.Set; -import java.util.concurrent.atomic.AtomicLong; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.traccar.Context; import org.traccar.model.Group; public class GroupsManager extends BaseObjectManager implements ManagableObjects { - private static final Logger LOGGER = LoggerFactory.getLogger(GroupsManager.class); - - private AtomicLong groupsLastUpdate = new AtomicLong(); - private final long dataRefreshDelay; - public GroupsManager(DataManager dataManager) { super(dataManager, Group.class); - dataRefreshDelay = Context.getConfig().getLong("database.refreshDelay", - DeviceManager.DEFAULT_REFRESH_DELAY) * 1000; } private void checkGroupCycles(Group group) { @@ -50,23 +40,11 @@ public class GroupsManager extends BaseObjectManager implements Managable } } - public void updateGroupCache(boolean force) throws SQLException { - long lastUpdate = groupsLastUpdate.get(); - if ((force || System.currentTimeMillis() - lastUpdate > dataRefreshDelay) - && groupsLastUpdate.compareAndSet(lastUpdate, System.currentTimeMillis())) { - refreshItems(); - } - } - @Override public Set getAllItems() { Set result = super.getAllItems(); if (result.isEmpty()) { - try { - updateGroupCache(true); - } catch (SQLException e) { - LOGGER.warn("Update group cache error", e); - } + refreshItems(); result = super.getAllItems(); } return result; -- cgit v1.2.3