aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/database
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-06-23 16:17:25 +0500
committerAbyss777 <abyss@fox5.ru>2016-06-23 16:17:25 +0500
commitbd2e0fdc6fe222316e9e740aa265b6d132d407b6 (patch)
tree0e146fde0b2a7556c380a4b715cb88e42b97d8cb /src/org/traccar/database
parenta445733519b4b38b52b03fbb63a55c7270cb9221 (diff)
downloadtraccar-server-bd2e0fdc6fe222316e9e740aa265b6d132d407b6.tar.gz
traccar-server-bd2e0fdc6fe222316e9e740aa265b6d132d407b6.tar.bz2
traccar-server-bd2e0fdc6fe222316e9e740aa265b6d132d407b6.zip
Added possibility to disable event and geofence subsystems
Diffstat (limited to 'src/org/traccar/database')
-rw-r--r--src/org/traccar/database/ConnectionManager.java4
-rw-r--r--src/org/traccar/database/NotificationManager.java4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java
index 8a1debdfa..8796673b1 100644
--- a/src/org/traccar/database/ConnectionManager.java
+++ b/src/org/traccar/database/ConnectionManager.java
@@ -94,7 +94,9 @@ public class ConnectionManager {
if (status.equals(Device.STATUS_ONLINE)) {
event.setType(Event.TYPE_DEVICE_ONLINE);
}
- Context.getNotificationManager().updateEvent(event, null);
+ if (Context.getNotificationManager() != null) {
+ Context.getNotificationManager().updateEvent(event, null);
+ }
}
device.setStatus(status);
diff --git a/src/org/traccar/database/NotificationManager.java b/src/org/traccar/database/NotificationManager.java
index 7593367a3..ab6b2230a 100644
--- a/src/org/traccar/database/NotificationManager.java
+++ b/src/org/traccar/database/NotificationManager.java
@@ -41,8 +41,8 @@ public class NotificationManager {
Set<Long> users = Context.getPermissionsManager().getDeviceUsers(event.getDeviceId());
for (Long userId : users) {
- if (event.getGeofenceId() == 0
- || Context.getGeofenceManager().checkGeofence(userId, event.getGeofenceId())) {
+ if (event.getGeofenceId() == 0 || Context.getGeofenceManager() != null
+ && Context.getGeofenceManager().checkGeofence(userId, event.getGeofenceId())) {
Context.getConnectionManager().updateEvent(userId, event, position);
}
}