From 0e6476926c08b699e5a4766bd756cd1e3a0ad043 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Fri, 6 Aug 2021 18:58:53 +0300
Subject: [PATCH] Build fix

---
 .../org/thingsboard/server/controller/DeviceController.java | 6 +++---
 .../thingsboard/server/service/rpc/RemoveRpcActorMsg.java   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
index f66ba01e42..f7add8c761 100644
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
@@ -126,11 +126,11 @@ public class DeviceController extends BaseController {
 
             checkEntity(device.getId(), device, Resource.DEVICE);
 
-            Device oldDevice;
+            Device oldDevice = null;
             if (!created) {
-                oldDevice = deviceService.findDeviceById(getTenantId(), device.getId());
+                oldDevice = checkDeviceId(device.getId(), Operation.WRITE);
             } else {
-                oldDevice = null;
+                checkEntity(null, device, Resource.DEVICE);
             }
 
             Device savedDevice = checkNotNull(deviceService.saveDeviceWithAccessToken(device, accessToken));
diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/RemoveRpcActorMsg.java b/application/src/main/java/org/thingsboard/server/service/rpc/RemoveRpcActorMsg.java
index 94d4bec148..d25090247a 100644
--- a/application/src/main/java/org/thingsboard/server/service/rpc/RemoveRpcActorMsg.java
+++ b/application/src/main/java/org/thingsboard/server/service/rpc/RemoveRpcActorMsg.java
@@ -18,10 +18,10 @@ package org.thingsboard.server.service.rpc;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import org.thingsboard.rule.engine.api.msg.ToDeviceActorNotificationMsg;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.msg.MsgType;
+import org.thingsboard.server.common.msg.ToDeviceActorNotificationMsg;
 
 import java.util.UUID;