1 files changed, 8 insertions, 3 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 47472b1d4..dfb8c5f47 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -37,6 +37,7 @@ import org.traccar.database.MediaManager;
 import org.traccar.database.NotificationManager;
 import org.traccar.database.PermissionsManager;
 import org.traccar.database.GeofenceManager;
+import org.traccar.database.GroupsManager;
 import org.traccar.database.StatisticsManager;
 import org.traccar.database.UsersManager;
 import org.traccar.geocoder.BingMapsGeocoder;
@@ -105,6 +106,12 @@ public final class Context {
         return usersManager;
     }
 
+    private static GroupsManager groupsManager;
+
+    public static GroupsManager getGroupsManager() {
+        return groupsManager;
+    }
+
     private static DeviceManager deviceManager;
 
     public static DeviceManager getDeviceManager() {
@@ -241,9 +248,7 @@ public final class Context {
 
         if (dataManager != null) {
             usersManager = new UsersManager(dataManager);
-        }
-
-        if (dataManager != null) {
+            groupsManager = new GroupsManager(dataManager);
             deviceManager = new DeviceManager(dataManager);
         }