From 56784bd167ddf0bbc124269519b7a93b346bd5cc Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Wed, 20 Jul 2016 15:57:15 +0500
Subject: Change order cache initialization

---
 .checkstyle                                 | 10 ----------
 .gitignore                                  |  1 +
 src/org/traccar/database/DeviceManager.java |  2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 .checkstyle

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);
                 }
-- 
cgit v1.2.3