diff options
author | Anton Tananaev <anton@traccar.org> | 2022-05-30 18:39:50 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2022-05-30 18:39:50 -0700 |
commit | 4dc602d8a7700924b0117424533046b28f4a8df4 (patch) | |
tree | d1f5f1edcd8db36716d3d1f44cd57d69d0e6d996 /src/main/java/org/traccar/database/DeviceManager.java | |
parent | 9a68d1045f30bf8397d6cbf90df8f42f40979591 (diff) | |
download | trackermap-server-4dc602d8a7700924b0117424533046b28f4a8df4.tar.gz trackermap-server-4dc602d8a7700924b0117424533046b28f4a8df4.tar.bz2 trackermap-server-4dc602d8a7700924b0117424533046b28f4a8df4.zip |
Combine active device and session
Diffstat (limited to 'src/main/java/org/traccar/database/DeviceManager.java')
-rw-r--r-- | src/main/java/org/traccar/database/DeviceManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/traccar/database/DeviceManager.java b/src/main/java/org/traccar/database/DeviceManager.java index 0e5056e57..b1ea0b8b7 100644 --- a/src/main/java/org/traccar/database/DeviceManager.java +++ b/src/main/java/org/traccar/database/DeviceManager.java @@ -68,7 +68,7 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity } @Override - public long addUnknownDevice(String uniqueId) { + public Device addUnknownDevice(String uniqueId) { Device device = new Device(); device.setName(uniqueId); device.setUniqueId(uniqueId); @@ -89,10 +89,10 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity Context.getPermissionsManager().refreshAllExtendedPermissions(); } - return device.getId(); + return device; } catch (StorageException e) { LOGGER.warn("Automatic device registration error", e); - return 0; + return null; } } |