Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

9 years ago · d8e40fb8d6
parent 5595e14b33 c826be9b3e
commit d8e40fb8d6
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
@ -145,7 +145,9 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
                    this.modifyEnrollment(device);
                    status = true;
                } else {
-                    this.setStatus(deviceIdentifier, existingEnrolmentInfo.getOwner(), EnrolmentInfo.Status.INACTIVE);
+                    if (!EnrolmentInfo.Status.REMOVED.equals(existingEnrolmentInfo.getStatus())) {
+                        this.setStatus(deviceIdentifier, existingEnrolmentInfo.getOwner(), EnrolmentInfo.Status.INACTIVE);
+                    }
                    int enrolmentId;
                    try {
                        DeviceManagementDAOFactory.beginTransaction();