Add null and empty check for device location related values

revert-dabc3590
Saad Sahibjan 5 years ago
parent e3018971d0
commit 6901747aeb

@ -34,6 +34,7 @@
*/ */
package org.wso2.carbon.mdm.services.android.services.impl; package org.wso2.carbon.mdm.services.android.services.impl;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.Device;
@ -501,7 +502,6 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
} }
if (propertyName.equals("ALTITUDE")) { if (propertyName.equals("ALTITUDE")) {
altitude = property.getValue(); altitude = property.getValue();
} }
if (propertyName.equals("SPEED")) { if (propertyName.equals("SPEED")) {
speed = property.getValue(); speed = property.getValue();
@ -514,7 +514,9 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
} }
} }
if (!latitude.isEmpty() && !longitude.isEmpty()) { if (StringUtils.isNotBlank(latitude) && StringUtils.isNotBlank(longitude) &&
StringUtils.isNotBlank(altitude) && StringUtils.isNotBlank(speed) &&
StringUtils.isNotBlank(bearing) && StringUtils.isNotBlank(distance)) {
location = new DeviceLocation(); location = new DeviceLocation();
location.setLatitude(Double.valueOf(latitude)); location.setLatitude(Double.valueOf(latitude));
location.setLongitude(Double.valueOf(longitude)); location.setLongitude(Double.valueOf(longitude));

Loading…
Cancel
Save