From 75374d646e3fe848e00eb7b959b557c0ed0ade68 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 1 Aug 2017 17:23:24 +0500
Subject: Fix retrieving objects by unknown tokens/uniqueId

---
 src/org/traccar/database/DriversManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/org/traccar/database/DriversManager.java')

diff --git a/src/org/traccar/database/DriversManager.java b/src/org/traccar/database/DriversManager.java
index 9defa1931..930951460 100644
--- a/src/org/traccar/database/DriversManager.java
+++ b/src/org/traccar/database/DriversManager.java
@@ -23,7 +23,7 @@ import org.traccar.model.Driver;
 
 public class DriversManager extends ExtendedObjectManager<Driver> {
 
-    private Map<String, Long> driversByUniqueId;
+    private Map<String, Driver> driversByUniqueId;
 
     public DriversManager(DataManager dataManager) {
         super(dataManager, Driver.class);
@@ -36,7 +36,7 @@ public class DriversManager extends ExtendedObjectManager<Driver> {
         if (driversByUniqueId == null) {
             driversByUniqueId = new ConcurrentHashMap<>(getAllItems().size());
         }
-        driversByUniqueId.put(driver.getUniqueId(), driver.getId());
+        driversByUniqueId.put(driver.getUniqueId(), driver);
     }
 
     @Override
@@ -68,6 +68,6 @@ public class DriversManager extends ExtendedObjectManager<Driver> {
     }
 
     public Driver getDriverByUniqueId(String uniqueId) {
-        return getById(driversByUniqueId.get(uniqueId));
+        return driversByUniqueId.get(uniqueId);
     }
 }
-- 
cgit v1.2.3