From 771f334d686b252b3b6975beb758c3833e85f0f2 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Thu, 30 Jun 2022 17:55:43 -0700
Subject: Check for attribute

---
 src/main/java/org/traccar/handler/CopyAttributesHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/org/traccar/handler')

diff --git a/src/main/java/org/traccar/handler/CopyAttributesHandler.java b/src/main/java/org/traccar/handler/CopyAttributesHandler.java
index 405a52ecd..50d36471a 100644
--- a/src/main/java/org/traccar/handler/CopyAttributesHandler.java
+++ b/src/main/java/org/traccar/handler/CopyAttributesHandler.java
@@ -44,7 +44,7 @@ public class CopyAttributesHandler extends BaseDataHandler {
             String attributesString = AttributeUtil.lookup(
                     cacheManager, Keys.PROCESSING_COPY_ATTRIBUTES, position.getDeviceId());
             Position last = cacheManager.getPosition(position.getDeviceId());
-            if (last != null) {
+            if (last != null && attributesString != null) {
                 for (String attribute : attributesString.split("[ ,]")) {
                     if (last.getAttributes().containsKey(attribute)
                             && !position.getAttributes().containsKey(attribute)) {
-- 
cgit v1.2.3