aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorSrk <watertext@hotmail.it>2017-11-18 20:10:33 +0100
committerSrk <watertext@hotmail.it>2017-11-18 20:10:33 +0100
commit7d2f57e2f45b8e3f92324eb4f9fd1cdd975d311c (patch)
treed1687c0d44d69ec3c49ff2e726711689b932bf2d /src/org
parente6ae0f1de880ab887d84aa31fe88b2e1eb67bad8 (diff)
downloadtraccar-server-7d2f57e2f45b8e3f92324eb4f9fd1cdd975d311c.tar.gz
traccar-server-7d2f57e2f45b8e3f92324eb4f9fd1cdd975d311c.tar.bz2
traccar-server-7d2f57e2f45b8e3f92324eb4f9fd1cdd975d311c.zip
Rollback getting defaults without having an user instance
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/notification/NotificationFormatter.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/org/traccar/notification/NotificationFormatter.java b/src/org/traccar/notification/NotificationFormatter.java
index c537a64e0..ba3fdbecb 100644
--- a/src/org/traccar/notification/NotificationFormatter.java
+++ b/src/org/traccar/notification/NotificationFormatter.java
@@ -45,10 +45,7 @@ public final class NotificationFormatter {
Device device = Context.getIdentityManager().getById(event.getDeviceId());
VelocityContext velocityContext = new VelocityContext();
-
- if (user != null) {
- velocityContext.put("user", user);
- }
+ velocityContext.put("user", user);
velocityContext.put("device", device);
velocityContext.put("event", event);
if (position != null) {