diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-14 15:15:31 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-14 15:15:31 +1200 |
| commit | 7310ee5f15729ea8517bfb6b0890a46da1217610 (patch) | |
| tree | 44504738f127708420179a7dbbe2942cb67d0849 /src/org/traccar/database/ConnectionManager.java | |
| parent | 8e8da7019aab023ae255d0ed6d16b94d303fd468 (diff) | |
| parent | 0a6faa86c4b634fa3a94633506c4422623e36f1e (diff) | |
| download | trackermap-server-7310ee5f15729ea8517bfb6b0890a46da1217610.tar.gz trackermap-server-7310ee5f15729ea8517bfb6b0890a46da1217610.tar.bz2 trackermap-server-7310ee5f15729ea8517bfb6b0890a46da1217610.zip | |
Merge Java 7 update (fix #1273)
Diffstat (limited to 'src/org/traccar/database/ConnectionManager.java')
| -rw-r--r-- | src/org/traccar/database/ConnectionManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java index eb22379da..0d357a41c 100644 --- a/src/org/traccar/database/ConnectionManager.java +++ b/src/org/traccar/database/ConnectionManager.java @@ -31,9 +31,9 @@ import org.traccar.model.Position; public class ConnectionManager { - private Map<String, ActiveDevice> activeDevices = new HashMap<String, ActiveDevice>(); - private final Map<Long, Position> positions = new HashMap<Long, Position>(); - private final Map<Long, Set<DataCacheListener>> listeners = new HashMap<Long, Set<DataCacheListener>>(); + private Map<String, ActiveDevice> activeDevices = new HashMap<>(); + private final Map<Long, Position> positions = new HashMap<>(); + private final Map<Long, Set<DataCacheListener>> listeners = new HashMap<>(); public void init(DataManager dataManager) { try { @@ -70,7 +70,7 @@ public class ConnectionManager { public synchronized Collection<Position> getInitialState(Collection<Long> devices) { - List<Position> result = new LinkedList<Position>(); + List<Position> result = new LinkedList<>(); for (long device : devices) { if (positions.containsKey(device)) { |