Merge branch 'application-mgt-new' into 'application-mgt-new'

Add null and empty check for device location related values

See merge request entgra/carbon-device-mgt!304
This commit is contained in:
Dharmakeerthi Lasantha 2019-10-10 13:46:18 +00:00
commit c0a3408694

View File

@ -3271,7 +3271,9 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
distance = p.getValue(); distance = p.getValue();
} }
} }
if (latitude != null && longitude != null && !latitude.isEmpty() && !longitude.isEmpty()) { if (StringUtils.isNotBlank(latitude) && StringUtils.isNotBlank(longitude) &&
StringUtils.isNotBlank(altitude) && StringUtils.isNotBlank(speed) &&
StringUtils.isNotBlank(bearing) && StringUtils.isNotBlank(distance)) {
DeviceLocation deviceLocation = new DeviceLocation(); DeviceLocation deviceLocation = new DeviceLocation();
deviceLocation.setDeviceId(device.getId()); deviceLocation.setDeviceId(device.getId());
deviceLocation.setDeviceIdentifier(new DeviceIdentifier(device.getDeviceIdentifier(), deviceLocation.setDeviceIdentifier(new DeviceIdentifier(device.getDeviceIdentifier(),