From 40feabb9df335eb2f6a2b47a8fb169d855678d01 Mon Sep 17 00:00:00 2001
From: mharindu <milanharindu.ucsc@gmail.com>
Date: Tue, 19 May 2015 17:13:36 +0530
Subject: [PATCH] Fixed bug in device disenrollment

---
 .../mgt/core/DeviceManagementServiceProviderImpl.java      | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java
index 22265bf0e9..0f8032899d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementServiceProviderImpl.java
@@ -137,13 +137,6 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
         DeviceManager dms =
                 this.getPluginRepository().getDeviceManagementProvider(deviceId.getType());
         boolean status = dms.disenrollDevice(deviceId);
-        try {
-            int deviceID = Integer.parseInt(deviceId.getId());
-            this.getDeviceDAO().updateDeviceStatus(deviceID, Status.INACTIVE);
-        } catch (DeviceManagementDAOException e) {
-            throw new DeviceManagementException("Error occurred while modifying the device " +
-                                                "'" + deviceId.getId() + "'", e);
-        }
         return status;
     }