Merge pull request #669 from lakshani/reenrollment-device

Fixed jira IOTS-438
8 years ago · 52455b4c40
parent 0e5895ec78 5c7cfda487
commit 52455b4c40
1 changed files with 3 additions and 1 deletions
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
@ -269,7 +269,9 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
            DeviceManagementDAOFactory.beginTransaction();
            Device currentDevice = deviceDAO.getDevice(deviceIdentifier, tenantId);
            device.setId(currentDevice.getId());
-            device.getEnrolmentInfo().setId(currentDevice.getEnrolmentInfo().getId());
+            if (device.getEnrolmentInfo().getId() == 0) {
+                device.getEnrolmentInfo().setId(currentDevice.getEnrolmentInfo().getId());
+            }
            if (device.getName() == null) {
                device.setName(currentDevice.getName());
            }