diff options
| author | Christoph Krey <c@ckrey.de> | 2018-04-16 10:45:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-16 10:45:11 +0200 |
| commit | 3a602dd133b533cc69d5986d64a00fb3ed670f75 (patch) | |
| tree | 97ff753db310a49ae7e53240b1db07fb8475679e /src/org/traccar/database/DeviceManager.java | |
| parent | 232de5f0daef98f31b28d177d991fdbfa191f195 (diff) | |
| parent | 6d4b8df25c7e942b9ad594db9444fe15bcb16be9 (diff) | |
| download | traccar-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.tar.gz traccar-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.tar.bz2 traccar-server-3a602dd133b533cc69d5986d64a00fb3ed670f75.zip | |
Merge pull request #4 from traccar/master
upgrade to current master
Diffstat (limited to 'src/org/traccar/database/DeviceManager.java')
| -rw-r--r-- | src/org/traccar/database/DeviceManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java index cb410b7c0..c59061b7f 100644 --- a/src/org/traccar/database/DeviceManager.java +++ b/src/org/traccar/database/DeviceManager.java @@ -65,7 +65,7 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity refreshLastPositions(); } - private void updateDeviceCache(boolean force) throws SQLException { + public void updateDeviceCache(boolean force) throws SQLException { long lastUpdate = devicesLastUpdate.get(); if ((force || System.currentTimeMillis() - lastUpdate > dataRefreshDelay) && devicesLastUpdate.compareAndSet(lastUpdate, System.currentTimeMillis())) { @@ -355,7 +355,7 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity Position last = positions.get(deviceTotalDistance.getDeviceId()); if (last != null) { last.getAttributes().put(Position.KEY_TOTAL_DISTANCE, deviceTotalDistance.getTotalDistance()); - getDataManager().addPosition(last); + getDataManager().addObject(last); updateLatestPosition(last); } else { throw new IllegalArgumentException(); |