aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2018-01-23 14:13:32 +0500
committerAbyss777 <abyss@fox5.ru>2018-01-23 14:13:32 +0500
commit2fc0683c9611c55997e85c5775a8b82f71b575ae (patch)
tree21f687b4fcbb8d66d91b96c7b1b0a704ec139f26
parent9b74f4a691354db61a3096794f3daeec575b8517 (diff)
downloadtrackermap-server-2fc0683c9611c55997e85c5775a8b82f71b575ae.tar.gz
trackermap-server-2fc0683c9611c55997e85c5775a8b82f71b575ae.tar.bz2
trackermap-server-2fc0683c9611c55997e85c5775a8b82f71b575ae.zip
Rename variable
-rw-r--r--schema/changelog-3.16.xml2
-rw-r--r--src/org/traccar/database/NotificationManager.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/schema/changelog-3.16.xml b/schema/changelog-3.16.xml
index 615222676..74fe35c3d 100644
--- a/schema/changelog-3.16.xml
+++ b/schema/changelog-3.16.xml
@@ -24,7 +24,7 @@
<column name="calendarid" type="INT" />
</addColumn>
- <addForeignKeyConstraint baseColumnNames="calendarid" baseTableName="notifications" constraintName="fk_notification_calendar_calendarid" onDelete="SET NULL" onUpdate="RESTRICT" referencedColumnNames="id" referencedTableName="calendars"/>
+ <addForeignKeyConstraint baseColumnNames="calendarid" baseTableName="notifications" constraintName="fk_notification_calendar_calendarid" onDelete="SET NULL" onUpdate="RESTRICT" referencedColumnNames="id" referencedTableName="calendars" />
</changeSet>
</databaseChangeLog>
diff --git a/src/org/traccar/database/NotificationManager.java b/src/org/traccar/database/NotificationManager.java
index c666f27ce..34c39e8ab 100644
--- a/src/org/traccar/database/NotificationManager.java
+++ b/src/org/traccar/database/NotificationManager.java
@@ -44,14 +44,14 @@ public class NotificationManager extends ExtendedObjectManager<Notification> {
geocodeOnRequest = Context.getConfig().getBoolean("geocoder.onRequest");
}
- private Set<Long> getEffectiveNotifications(long userId, long deviceId, Date date) {
+ private Set<Long> getEffectiveNotifications(long userId, long deviceId, Date time) {
Set<Long> result = new HashSet<>();
Set<Long> deviceNotifications = getAllDeviceItems(deviceId);
for (long itemId : getUserItems(userId)) {
if (getById(itemId).getAlways() || deviceNotifications.contains(itemId)) {
long calendarId = getById(itemId).getCalendarId();
Calendar calendar = calendarId != 0 ? Context.getCalendarManager().getById(calendarId) : null;
- if (calendar == null || calendar.checkMoment(date)) {
+ if (calendar == null || calendar.checkMoment(time)) {
result.add(itemId);
}
}