From 159f0ef4861b64085cdd1c1d8d0234f47bc75797 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 16 Jul 2022 08:03:57 -0700
Subject: Update only if password changed

---
 src/main/java/org/traccar/api/BaseObjectResource.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/main/java/org/traccar/api/BaseObjectResource.java b/src/main/java/org/traccar/api/BaseObjectResource.java
index 408594315..0ec2bfeaa 100644
--- a/src/main/java/org/traccar/api/BaseObjectResource.java
+++ b/src/main/java/org/traccar/api/BaseObjectResource.java
@@ -99,8 +99,11 @@ public abstract class BaseObjectResource<T extends BaseModel> extends BaseResour
                 new Columns.Exclude("id"),
                 new Condition.Equals("id", "id")));
         if (entity instanceof User) {
-            storage.updateObject(entity, new Request(
-                    new Columns.Include("hashedPassword", "salt"), new Condition.Equals("id", "id")));
+            User user = (User) entity;
+            if (user.getHashedPassword() != null) {
+                storage.updateObject(entity, new Request(
+                        new Columns.Include("hashedPassword", "salt"), new Condition.Equals("id", "id")));
+            }
         }
         cacheManager.updateOrInvalidate(true, entity);
         LogAction.edit(getUserId(), entity);
-- 
cgit v1.2.3