Handle null phone (fix traccar#3691)

nadezhdamosunova · Dec 20, 2017 · 49d36d2 · 49d36d2
1 parent 4fb9b7e
commit 49d36d2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java
@@ -168,7 +168,10 @@ protected void updateCachedItem(Device device) {
         }
         if (device.getPhone() != null && !device.getPhone().isEmpty()
                 && !device.getPhone().equals(cachedDevice.getPhone())) {
-            devicesByPhone.remove(cachedDevice.getPhone());
+            String phone = cachedDevice.getPhone();
+            if (phone != null && !phone.isEmpty()) {
+                devicesByPhone.remove(phone);
+            }
             cachedDevice.setPhone(device.getPhone());
             putPhone(cachedDevice);
         }