Include data directly into events

1 files changed, 4 insertions, 4 deletions

diff --git a/src/org/traccar/events/CommandResultEventHandler.java b/src/org/traccar/events/CommandResultEventHandler.java
index aaa1d23f0..077c389c9 100644
--- a/src/org/traccar/events/CommandResultEventHandler.java
+++ b/src/org/traccar/events/CommandResultEventHandler.java
@@ -15,8 +15,8 @@
  */
 package org.traccar.events;
 
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 
 import org.traccar.BaseEventHandler;
 import org.traccar.model.Event;
@@ -28,9 +28,9 @@ public class CommandResultEventHandler extends BaseEventHandler {
     protected Collection<Event> analyzePosition(Position position) {
         Object commandResult = position.getAttributes().get(Position.KEY_RESULT);
         if (commandResult != null) {
-            Collection<Event> events = new ArrayList<>();
-            events.add(new Event(Event.TYPE_COMMAND_RESULT, position.getDeviceId(), position.getId()));
-            return events;
+            Event event = new Event(Event.TYPE_COMMAND_RESULT, position.getDeviceId(), position.getId());
+            event.set(Position.KEY_RESULT, (String) commandResult);
+            return Collections.singleton(event);
         }
         return null;
     }