From cabe5b5df2c1d31cd5fd3eeccbea32fa79cf404c Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 27 Jul 2017 14:57:22 +0500 Subject: Initialize some maps, because they might be accessed before initialized. --- src/org/traccar/database/DeviceManager.java | 6 ++++++ src/org/traccar/database/DriversManager.java | 3 +++ src/org/traccar/database/UsersManager.java | 3 +++ 3 files changed, 12 insertions(+) (limited to 'src/org/traccar/database') diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java index 4aafe6631..5d123f9b8 100644 --- a/src/org/traccar/database/DeviceManager.java +++ b/src/org/traccar/database/DeviceManager.java @@ -57,6 +57,12 @@ public class DeviceManager extends BaseObjectManager implements Identity public DeviceManager(DataManager dataManager) { super(dataManager, Device.class); this.config = Context.getConfig(); + if (devicesByPhone == null) { + devicesByPhone = new ConcurrentHashMap<>(); + } + if (devicesByUniqueId == null) { + devicesByUniqueId = new ConcurrentHashMap<>(); + } dataRefreshDelay = config.getLong("database.refreshDelay", DEFAULT_REFRESH_DELAY) * 1000; lookupGroupsAttribute = config.getBoolean("deviceManager.lookupGroupsAttribute"); fallbackToText = config.getBoolean("command.fallbackToSms"); diff --git a/src/org/traccar/database/DriversManager.java b/src/org/traccar/database/DriversManager.java index d3866a5f0..9defa1931 100644 --- a/src/org/traccar/database/DriversManager.java +++ b/src/org/traccar/database/DriversManager.java @@ -27,6 +27,9 @@ public class DriversManager extends ExtendedObjectManager { public DriversManager(DataManager dataManager) { super(dataManager, Driver.class); + if (driversByUniqueId == null) { + driversByUniqueId = new ConcurrentHashMap<>(); + } } private void putUniqueDriverId(Driver driver) { diff --git a/src/org/traccar/database/UsersManager.java b/src/org/traccar/database/UsersManager.java index 28e6a31b2..ed39f6cfa 100644 --- a/src/org/traccar/database/UsersManager.java +++ b/src/org/traccar/database/UsersManager.java @@ -29,6 +29,9 @@ public class UsersManager extends SimpleObjectManager { public UsersManager(DataManager dataManager) { super(dataManager, User.class); + if (usersTokens == null) { + usersTokens = new ConcurrentHashMap<>(); + } } private void putToken(User user) { -- cgit v1.2.3 From ec82098c6bc3c84672665552839a97ddb6771afc Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 27 Jul 2017 15:41:18 +0500 Subject: Replace getClassByName function to switch --- src/org/traccar/database/DataManager.java | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'src/org/traccar/database') diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 862efbc91..07ad0be44 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -37,11 +37,17 @@ import liquibase.resource.ResourceAccessor; import org.traccar.Config; import org.traccar.helper.Log; +import org.traccar.model.Attribute; import org.traccar.model.AttributeAlias; import org.traccar.model.Device; +import org.traccar.model.Driver; import org.traccar.model.Event; +import org.traccar.model.Geofence; +import org.traccar.model.Group; +import org.traccar.model.ManagedUser; import org.traccar.model.Permission; import org.traccar.model.BaseModel; +import org.traccar.model.Calendar; import org.traccar.model.Position; import org.traccar.model.Server; import org.traccar.model.Statistics; @@ -269,8 +275,26 @@ public class DataManager { } public static Class getClassByName(String name) throws ClassNotFoundException { - return Class.forName("org.traccar.model." - + name.substring(0, 1).toUpperCase() + name.replace("Id", "").substring(1)); + switch (name.toLowerCase().replace("id", "")) { + case "device": + return Device.class; + case "group": + return Group.class; + case "user": + return User.class; + case "manageduser": + return ManagedUser.class; + case "geofence": + return Geofence.class; + case "driver": + return Driver.class; + case "attribute": + return Attribute.class; + case "calendar": + return Calendar.class; + default: + throw new ClassNotFoundException(); + } } public static String makeNameId(Class clazz) { -- cgit v1.2.3