Commit a726b3486025869eb31dad644ea38030e448d9d7

Authored by Volodymyr Babak
1 parent 492a1422

Send updated in case CONFLICT msg

@@ -42,7 +42,8 @@ public class DeviceUpdateMsgConstructor { @@ -42,7 +42,8 @@ public class DeviceUpdateMsgConstructor {
42 builder.setLabel(device.getLabel()); 42 builder.setLabel(device.getLabel());
43 } 43 }
44 if (msgType.equals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE) || 44 if (msgType.equals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE) ||
45 - msgType.equals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE)) { 45 + msgType.equals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE) ||
  46 + msgType.equals(UpdateMsgType.DEVICE_CONFLICT_RPC_MESSAGE)) {
46 DeviceCredentials deviceCredentials 47 DeviceCredentials deviceCredentials
47 = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getTenantId(), device.getId()); 48 = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getTenantId(), device.getId());
48 if (deviceCredentials != null) { 49 if (deviceCredentials != null) {