Send updated in case CONFLICT msg

6 years ago · a726b34860
1 changed files with 2 additions and 1 deletions
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceUpdateMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceUpdateMsgConstructor.java
@ -42,7 +42,8 @@ public class DeviceUpdateMsgConstructor {
            builder.setLabel(device.getLabel());
        }
        if (msgType.equals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE) ||
-                msgType.equals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE)) {
+                msgType.equals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE) ||
+                msgType.equals(UpdateMsgType.DEVICE_CONFLICT_RPC_MESSAGE)) {
            DeviceCredentials deviceCredentials
                    = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getTenantId(), device.getId());
            if (deviceCredentials != null) {