fixing windows device name issue

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

@@ -274,7 +274,9 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
             Device currentDevice = deviceDAO.getDevice(deviceIdentifier, tenantId);
             device.setId(currentDevice.getId());
             device.getEnrolmentInfo().setId(currentDevice.getEnrolmentInfo().getId());
+            if (device.getName() == null) {
                 device.setName(currentDevice.getName());
+            }
             deviceDAO.updateDevice(device, tenantId);
             enrollmentDAO.updateEnrollment(device.getEnrolmentInfo());
             DeviceManagementDAOFactory.commitTransaction();
@@ -1225,7 +1227,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         List<TaskOperation> taskOperations;
         Map<String, List<TaskOperation>> deviceTypeSpecificTasks = new HashMap<>();
 
-        for(DeviceTypeIdentifier dti : deviceManagementServiceMap.keySet()){
+        for (DeviceTypeIdentifier dti : deviceManagementServiceMap.keySet()) {
             dms = deviceManagementServiceMap.get(dti);
             taskOperations = dms.getTasksForPlatform();
             if (taskOperations != null) {