aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-07-20 15:57:15 +0500
committerAbyss777 <abyss@fox5.ru>2016-07-20 15:57:15 +0500
commit56784bd167ddf0bbc124269519b7a93b346bd5cc (patch)
tree44b6ec5bcdf21990a3aff61a2cd556db0e8f463b
parent32a7fe7eb22d435906b65f91c37751ece4fea828 (diff)
downloadtrackermap-server-56784bd167ddf0bbc124269519b7a93b346bd5cc.tar.gz
trackermap-server-56784bd167ddf0bbc124269519b7a93b346bd5cc.tar.bz2
trackermap-server-56784bd167ddf0bbc124269519b7a93b346bd5cc.zip
Change order cache initialization
-rw-r--r--.checkstyle10
-rw-r--r--.gitignore1
-rw-r--r--src/org/traccar/database/DeviceManager.java2
3 files changed, 2 insertions, 11 deletions
diff --git a/.checkstyle b/.checkstyle
deleted file mode 100644
index 0b4b1b908..000000000
--- a/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="traccar" location="checkstyle.xml" type="project" description="">
- <additional-data name="protect-config-file" value="true"/>
- </local-check-config>
- <fileset name="java-sources-checkstyle" enabled="true" check-config-name="traccar" local="true">
- <file-match-pattern match-pattern="src/.*\.java" include-pattern="true"/>
- </fileset>
-</fileset-config>
diff --git a/.gitignore b/.gitignore
index 4bb6eefb9..00818a38a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ nbactions.xml
.idea
*.iml
.DS_Store
+.checkstyle
diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java
index b6cb8c65f..43d83d078 100644
--- a/src/org/traccar/database/DeviceManager.java
+++ b/src/org/traccar/database/DeviceManager.java
@@ -60,8 +60,8 @@ public class DeviceManager implements IdentityManager {
dataRefreshDelay = config.getLong("database.refreshDelay", DEFAULT_REFRESH_DELAY) * 1000;
if (dataManager != null) {
try {
- updateDeviceCache(true);
updateGroupCache(true);
+ updateDeviceCache(true);
for (Position position : dataManager.getLatestPositions()) {
positions.put(position.getDeviceId(), position);
}