aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/database
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2018-04-13 12:21:05 +0500
committerAbyss777 <abyss@fox5.ru>2018-04-13 12:21:05 +0500
commit30ae3d104e9b0446364ebc316dc10d0f811e1480 (patch)
treeb1e0a223e4cb68c5869fcb5cec9b13e893e749da /src/org/traccar/database
parent87de21e95c34936e7d7635c3dd8c07f6221f46eb (diff)
downloadtrackermap-server-30ae3d104e9b0446364ebc316dc10d0f811e1480.tar.gz
trackermap-server-30ae3d104e9b0446364ebc316dc10d0f811e1480.tar.bz2
trackermap-server-30ae3d104e9b0446364ebc316dc10d0f811e1480.zip
- Rename field to Period
- Remove unnecessary check for null - Move MaintenanceManager initialization with other event related managers
Diffstat (limited to 'src/org/traccar/database')
-rw-r--r--src/org/traccar/database/NotificationManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/database/NotificationManager.java b/src/org/traccar/database/NotificationManager.java
index 9f2606f7f..3bc048356 100644
--- a/src/org/traccar/database/NotificationManager.java
+++ b/src/org/traccar/database/NotificationManager.java
@@ -78,8 +78,8 @@ public class NotificationManager extends ExtendedObjectManager<Notification> {
usersToForward = new HashSet<>();
}
for (long userId : users) {
- if ((event.getGeofenceId() == 0 || Context.getGeofenceManager() != null
- && Context.getGeofenceManager().checkItemPermission(userId, event.getGeofenceId()))
+ if ((event.getGeofenceId() == 0
+ || Context.getGeofenceManager().checkItemPermission(userId, event.getGeofenceId()))
&& (event.getMaintenanceId() == 0
|| Context.getMaintenancesManager().checkItemPermission(userId, event.getMaintenanceId()))) {
if (usersToForward != null) {