Refactoring

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java

@@ -1531,7 +1531,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     }
 
     @Override
-    public List<Activity> getOperationByActivityIds(List<String> idList) throws OperationManagementException{
+    public List<Activity> getOperationByActivityIds(List<String> idList) throws OperationManagementException {
         return DeviceManagementDataHolder.getInstance().getOperationManager().getOperationByActivityIds(idList);
     }
 
@@ -2515,7 +2515,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         if (log.isDebugEnabled()) {
             log.debug("Get installed applications of device: " + device.getId() + " of type '" + device.getType() + "'");
         }
-        List<Application> applications = new ArrayList<>();
+        List<Application> applications;
         try {
             DeviceManagementDAOFactory.openConnection();
             applications = applicationDAO.getInstalledApplications(device.getId(), device.getEnrolmentInfo().getId());
@@ -2671,8 +2671,10 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
                     deviceInformationManager.addDeviceLocation(deviceLocation);
                 } catch (Exception e) {
                     //We are not failing the execution since this is not critical for the functionality. But logging as
-                    // an error for reference.
-                    log.error("Exception occurred while trying to add device location.", e);
+                    // a warning for reference.
+                    log.warn("Error occurred while trying to add '" + device.getType() + "' device '" +
+                            device.getDeviceIdentifier() + "' (id:'" + device.getId() + "') location (lat:" + latitude +
+                            ", lon:" + longitude + ") due to:" + e.getMessage());
                 }
             }
         }