refacotring to be in sync with PE

10 months ago · c5a8a874a9
1 changed files with 6 additions and 2 deletions
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/BaseUserProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/user/BaseUserProcessor.java
@ -47,8 +47,12 @@ public abstract class BaseUserProcessor extends BaseEdgeProcessor {
            }

            User userById = edgeCtx.getUserService().findUserById(tenantId, userId);
-            isCreated = userById == null;
-            user.setId(isCreated ? null : userId);
+            if (userById == null) {
+                isCreated = true;
+                user.setId(null);
+            } else {
+                user.setId(userId);
+            }

            String userEmail = user.getEmail();
            User existing = edgeCtx.getUserService().findUserByTenantIdAndEmail(tenantId, user.getEmail());