Merge remote-tracking branch 'upstream/master'

1 files changed, 10 insertions, 1 deletions

diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 5a3dca878..581f00082 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.traccar.database.IdentityManager;
 import org.traccar.database.NotificationManager;
 import org.traccar.database.PermissionsManager;
 import org.traccar.database.GeofenceManager;
+import org.traccar.database.StatisticsManager;
 import org.traccar.geocode.BingMapsReverseGeocoder;
 import org.traccar.geocode.FactualReverseGeocoder;
 import org.traccar.geocode.GeocodeFarmReverseGeocoder;
@@ -142,6 +143,12 @@ public final class Context {
         return aliasesManager;
     }
 
+    private static StatisticsManager statisticsManager;
+
+    public static StatisticsManager getStatisticsManager() {
+        return statisticsManager;
+    }
+
     public static void init(String[] arguments) throws Exception {
 
         config = new Config();
@@ -245,6 +252,8 @@ public final class Context {
 
         aliasesManager = new AliasesManager(dataManager);
 
+        statisticsManager = new StatisticsManager();
+
     }
 
     public static void init(IdentityManager testIdentityManager) {