Fix NPE occur when updating device with null status

revert-70ac1926
Charitha Goonetilleke 4 years ago committed by charithag
parent 44b2621381
commit ad4d7a453f

@ -457,6 +457,9 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
if (device.getEnrolmentInfo().getId() == 0) { if (device.getEnrolmentInfo().getId() == 0) {
device.getEnrolmentInfo().setId(currentDevice.getEnrolmentInfo().getId()); device.getEnrolmentInfo().setId(currentDevice.getEnrolmentInfo().getId());
} }
if (device.getEnrolmentInfo().getStatus() == null) {
device.getEnrolmentInfo().setStatus(currentDevice.getEnrolmentInfo().getStatus());
}
if (device.getName() == null) { if (device.getName() == null) {
device.setName(currentDevice.getName()); device.setName(currentDevice.getName());
} }

Loading…
Cancel
Save