From 7d2f57e2f45b8e3f92324eb4f9fd1cdd975d311c Mon Sep 17 00:00:00 2001
From: Srk <watertext@hotmail.it>
Date: Sat, 18 Nov 2017 20:10:33 +0100
Subject: Rollback getting defaults without having an user instance

---
 src/org/traccar/notification/NotificationFormatter.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/org/traccar/notification/NotificationFormatter.java')

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) {
-- 
cgit v1.2.3