Fixed local conflicts and merged

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/IllegalTransactionStateException.java

@@ -0,0 +1,59 @@
+/*
+ *   Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.mgt.common;
+
+public class IllegalTransactionStateException extends RuntimeException {
+
+    private static final long serialVersionUID = -3151279331929070297L;
+
+    private String errorMessage;
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public IllegalTransactionStateException(String msg, Exception nestedEx) {
+        super(msg, nestedEx);
+        setErrorMessage(msg);
+    }
+
+    public IllegalTransactionStateException(String message, Throwable cause) {
+        super(message, cause);
+        setErrorMessage(message);
+    }
+
+    public IllegalTransactionStateException(String msg) {
+        super(msg);
+        setErrorMessage(msg);
+    }
+
+    public IllegalTransactionStateException() {
+        super();
+    }
+
+    public IllegalTransactionStateException(Throwable cause) {
+        super(cause);
+    }
+
+
+}

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java

@@ -45,6 +45,7 @@ import org.wso2.carbon.identity.oauth.stub.OAuthAdminServiceStub;
 import org.wso2.carbon.identity.oauth.stub.dto.OAuthConsumerAppDTO;
 
 import java.rmi.RemoteException;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -173,6 +174,7 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
     @Override
     public void updateApplicationListInstalledInDevice(
             DeviceIdentifier deviceIdentifier, List<Application> applications) throws ApplicationManagementException {
+        List<Application> installedAppList = getApplicationListForDevice(deviceIdentifier);
         try {
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
             DeviceManagementDAOFactory.beginTransaction();
@@ -182,8 +184,6 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
                 log.debug("Device:" + device.getId() + ":identifier:" + deviceIdentifier.getId());
             }
 
-            List<Application> installedAppList = getApplicationListForDevice(deviceIdentifier);
-
             if (log.isDebugEnabled()) {
                 log.debug("num of apps installed:" + installedAppList.size());
             }
@@ -227,9 +227,13 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             }
             applicationMappingDAO.removeApplicationMapping(device.getId(), appIdsToRemove, tenantId);
             DeviceManagementDAOFactory.commitTransaction();
-        } catch (DeviceManagementDAOException | TransactionManagementException e) {
+        } catch (DeviceManagementDAOException e) {
             DeviceManagementDAOFactory.rollbackTransaction();
             throw new ApplicationManagementException("Error occurred saving application list to the device", e);
+        } catch (TransactionManagementException e) {
+            throw new ApplicationManagementException("Error occurred while initializing transaction", e);
+        } finally {
+            DeviceManagementDAOFactory.closeConnection();
         }
     }
 
@@ -239,11 +243,16 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
         Device device;
         try {
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
+            DeviceManagementDAOFactory.openConnection();
             device = deviceDAO.getDevice(deviceId, tenantId);
             return applicationDAO.getInstalledApplications(device.getId());
         } catch (DeviceManagementDAOException e) {
-            throw new ApplicationManagementException("Error occured while fetching the Application List of '" +
+            throw new ApplicationManagementException("Error occurred while fetching the Application List of '" +
                     deviceId.getType() + "' device carrying the identifier'" + deviceId.getId(), e);
+        } catch (SQLException e) {
+            throw new ApplicationManagementException("Error occurred while opening a connection to the data source", e);
+        } finally {
+            DeviceManagementDAOFactory.closeConnection();
         }
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOFactory.java

@@ -20,6 +20,7 @@ package org.wso2.carbon.device.mgt.core.dao;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.mgt.common.IllegalTransactionStateException;
 import org.wso2.carbon.device.mgt.common.TransactionManagementException;
 import org.wso2.carbon.device.mgt.core.config.datasource.DataSourceConfig;
 import org.wso2.carbon.device.mgt.core.config.datasource.JNDILookupDefinition;
@@ -113,8 +114,14 @@ public class DeviceManagementDAOFactory {
     }
 
     public static void beginTransaction() throws TransactionManagementException {
+        Connection conn = currentConnection.get();
+        if (conn != null) {
+            throw new IllegalTransactionStateException("A transaction is already active within the context of " +
+                    "this particular thread. Therefore, calling 'beginTransaction/openConnection' while another " +
+                    "transaction is already active is a sign of improper transaction handling");
+        }
         try {
-            Connection conn = dataSource.getConnection();
+            conn = dataSource.getConnection();
             conn.setAutoCommit(false);
             currentConnection.set(conn);
         } catch (SQLException e) {
@@ -123,59 +130,68 @@ public class DeviceManagementDAOFactory {
     }
 
     public static void openConnection() throws SQLException {
-        currentConnection.set(dataSource.getConnection());
+        Connection conn = currentConnection.get();
+        if (conn != null) {
+            throw new IllegalTransactionStateException("A transaction is already active within the context of " +
+                    "this particular thread. Therefore, calling 'beginTransaction/openConnection' while another " +
+                    "transaction is already active is a sign of improper transaction handling");
+        }
+        conn = dataSource.getConnection();
+        currentConnection.set(conn);
     }
 
     public static Connection getConnection() throws SQLException {
-        if (currentConnection.get() == null) {
+        Connection conn = currentConnection.get();
-            currentConnection.set(dataSource.getConnection());
+        if (conn == null) {
+            throw new IllegalTransactionStateException("No connection is associated with the current transaction. " +
+                    "This might have ideally been caused by not properly initiating the transaction via " +
+                    "'beginTransaction'/'openConnection' methods");
         }
-        return currentConnection.get();
+        return conn;
     }
 
     public static void commitTransaction() {
-        try {
         Connection conn = currentConnection.get();
-            if (conn != null) {
+        if (conn == null) {
-                conn.commit();
+            throw new IllegalTransactionStateException("No connection is associated with the current transaction. " +
-            } else {
+                    "This might have ideally been caused by not properly initiating the transaction via " +
-                if (log.isDebugEnabled()) {
+                    "'beginTransaction'/'openConnection' methods");
-                    log.debug("Datasource connection associated with the current thread is null, hence commit " +
-                            "has not been attempted");
-                }
         }
+        try {
+            conn.commit();
         } catch (SQLException e) {
             log.error("Error occurred while committing the transaction", e);
         }
     }
 
     public static void rollbackTransaction() {
-        try {
         Connection conn = currentConnection.get();
-            if (conn != null) {
+        if (conn == null) {
-                conn.rollback();
+            throw new IllegalTransactionStateException("No connection is associated with the current transaction. " +
-            } else {
+                    "This might have ideally been caused by not properly initiating the transaction via " +
-                if (log.isDebugEnabled()) {
+                    "'beginTransaction'/'openConnection' methods");
-                    log.debug("Datasource connection associated with the current thread is null, hence rollback " +
-                            "has not been attempted");
-                }
         }
+        try {
+            conn.rollback();
         } catch (SQLException e) {
-            log.warn("Error occurred while rollbacking the transaction", e);
+            log.warn("Error occurred while roll-backing the transaction", e);
         }
     }
 
     public static void closeConnection() {
-        Connection con = currentConnection.get();
+        Connection conn = currentConnection.get();
-        if (con != null) {
+        if (conn == null) {
+            throw new IllegalTransactionStateException("No connection is associated with the current transaction. " +
+                    "This might have ideally been caused by not properly initiating the transaction via " +
+                    "'beginTransaction'/'openConnection' methods");
+        }
         try {
-                con.close();
+            conn.close();
         } catch (SQLException e) {
             log.warn("Error occurred while close the connection");
         }
         currentConnection.remove();
     }
-    }
 
 
     /**

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/ApplicationMappingDAOImpl.java

@@ -111,7 +111,7 @@ public class ApplicationMappingDAOImpl implements ApplicationMappingDAO {
                     "APPLICATION_ID = ? AND TENANT_ID = ?";
             stmt = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
 
-            for(Integer appId:appIdList){
+            for (Integer appId : appIdList) {
                 stmt.setInt(1, deviceId);
                 stmt.setInt(2, appId);
                 stmt.setInt(3, tenantId);
@@ -120,7 +120,7 @@ public class ApplicationMappingDAOImpl implements ApplicationMappingDAO {
             stmt.executeBatch();
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while adding device application mapping", e);
-        }finally {
+        } finally {
             DeviceManagementDAOUtil.cleanupResources(stmt, null);
         }
     }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/DeviceDAOImpl.java

@@ -508,4 +508,5 @@ public class DeviceDAOImpl implements DeviceDAO {
         }
         return devices;
     }
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java

@@ -81,6 +81,7 @@ public class OperationManagerImpl implements OperationManager {
         }
         try {
             OperationManagementDAOFactory.beginTransaction();
+
             org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation operationDto =
                     OperationDAOUtil.convertOperation(operation);
 
@@ -89,7 +90,16 @@ public class OperationManagerImpl implements OperationManager {
             int enrolmentId;
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
             for (DeviceIdentifier deviceId : deviceIds) {
+                try {
+                    DeviceManagementDAOFactory.openConnection();
                     enrolmentId = deviceDAO.getEnrolmentByStatus(deviceId, EnrolmentInfo.Status.ACTIVE, tenantId);
+                } catch (SQLException e) {
+                    throw new OperationManagementException("Error occurred while opening a connection the data " +
+                            "source", e);
+                } finally {
+                    DeviceManagementDAOFactory.closeConnection();
+                }
+
                 if (enrolmentId < 0) {
                     String errorMsg = "The operation not added for device.The device not found for " +
                             "device Identifier type -'" + deviceId.getType() + "' and device Id '" +

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/OperationManagementDAOFactory.java

@@ -20,6 +20,7 @@ package org.wso2.carbon.device.mgt.core.operation.mgt.dao;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.mgt.common.IllegalTransactionStateException;
 import org.wso2.carbon.device.mgt.common.TransactionManagementException;
 import org.wso2.carbon.device.mgt.core.config.datasource.DataSourceConfig;
 import org.wso2.carbon.device.mgt.core.config.datasource.JNDILookupDefinition;
@@ -87,7 +88,9 @@ public class OperationManagementDAOFactory {
 
     public static Connection getConnection() throws SQLException {
         if (currentConnection.get() == null) {
-            currentConnection.set(dataSource.getConnection());
+            throw new IllegalTransactionStateException("No connection is associated with the current transaction. " +
+                    "This might have ideally caused by not properly initiating the transaction via " +
+                    "'beginTransaction'/'openConnection' methods");
         }
         return currentConnection.get();
     }

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

@@ -156,9 +156,11 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
                                     device.getDeviceIdentifier() + "', which belongs to " + "platform '" +
                                     device.getType() + " upon the user '" + device.getEnrolmentInfo().getOwner() + "'");
                         }
-                    } catch (TransactionManagementException | DeviceManagementDAOException e) {
+                    } catch (DeviceManagementDAOException e) {
                         DeviceManagementDAOFactory.rollbackTransaction();
-                        log.error("Error occurred while adding enrolment related metadata", e);
+                        throw new DeviceManagementException("Error occurred while adding enrolment related metadata", e);
+                    } catch (TransactionManagementException e) {
+                        throw new DeviceManagementException("Error occurred while initiating transaction", e);
                     } finally {
                         DeviceManagementDAOFactory.closeConnection();
                     }
@@ -173,10 +175,12 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
                 int deviceId = deviceDAO.addDevice(type.getId(), device, tenantId);
                 enrolmentId = enrolmentDAO.addEnrollment(deviceId, device.getEnrolmentInfo(), tenantId);
                 DeviceManagementDAOFactory.commitTransaction();
-            } catch (DeviceManagementDAOException | TransactionManagementException e) {
+            } catch (DeviceManagementDAOException e) {
                 DeviceManagementDAOFactory.rollbackTransaction();
-                log.error("Error occurred while adding metadata of '" + device.getType() + "' device carrying " +
+                throw new DeviceManagementException("Error occurred while adding metadata of '" + device.getType() +
-                        "the identifier '" + device.getDeviceIdentifier() + "'", e);
+                        "' device carrying the identifier '" + device.getDeviceIdentifier() + "'", e);
+            } catch (TransactionManagementException e) {
+                throw new DeviceManagementException("Error occurred while initiating transaction", e);
             } finally {
                 DeviceManagementDAOFactory.closeConnection();
             }
@@ -214,10 +218,12 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
             enrolmentDAO.updateEnrollment(deviceId, device.getEnrolmentInfo(), tenantId);
 
             DeviceManagementDAOFactory.commitTransaction();
-        } catch (DeviceManagementDAOException | TransactionManagementException e) {
+        } catch (DeviceManagementDAOException e) {
             DeviceManagementDAOFactory.rollbackTransaction();
             throw new DeviceManagementException("Error occurred while modifying the device " +
                     "'" + device.getId() + "'", e);
+        } catch (TransactionManagementException e) {
+            throw new DeviceManagementException("Error occurred while initiating transaction", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
@@ -247,10 +253,12 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
             deviceDAO.updateDevice(deviceType.getId(), device, tenantId);
 
             DeviceManagementDAOFactory.commitTransaction();
-        } catch (DeviceManagementDAOException | TransactionManagementException e) {
+        } catch (DeviceManagementDAOException e) {
             DeviceManagementDAOFactory.rollbackTransaction();
             throw new DeviceManagementException("Error occurred while dis-enrolling '" + deviceId.getType() +
                     "' device with the identifier '" + deviceId.getId() + "'", e);
+        } catch (TransactionManagementException e) {
+            throw new DeviceManagementException("Error occurred while initiating transaction", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
@@ -302,14 +310,16 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         List<Device> allDevices;
         try {
             DeviceManagementDAOFactory.openConnection();
-
             allDevices = deviceDAO.getDevices(this.getTenantId());
-        } catch (DeviceManagementDAOException | SQLException e) {
+        } catch (DeviceManagementDAOException e) {
             throw new DeviceManagementException("Error occurred while retrieving device list pertaining to " +
                     "the current tenant", e);
+        } catch (SQLException e) {
+            throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
+
         for (Device device : allDevices) {
             DeviceManager deviceManager = this.getDeviceManager(device.getType());
             if (deviceManager == null) {
@@ -338,9 +348,11 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         try {
             DeviceManagementDAOFactory.openConnection();
             allDevices = deviceDAO.getDevices(deviceType, this.getTenantId());
-        } catch (DeviceManagementDAOException | SQLException e) {
+        } catch (DeviceManagementDAOException e) {
             throw new DeviceManagementException("Error occurred while retrieving all devices of type '" +
                     deviceType + "' that are being managed within the scope of current tenant", e);
+        } catch (SQLException e) {
+            throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
@@ -415,7 +427,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
                     .getProperty("line.separator")).append(messageFooter3.trim());
 
         } catch (IOException e) {
-            log.error("IO error in processing enrol email message " + emailMessageProperties);
             throw new DeviceManagementException("Error replacing tags in email template '" +
                     emailMessageProperties.getSubject() + "'", e);
         }
@@ -479,7 +490,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
             messageBuilder.append(System.getProperty("line.separator")).append(messageFooter3.trim());
 
         } catch (IOException e) {
-            log.error("IO error in processing enrol email message " + emailMessageProperties);
             throw new DeviceManagementException("Error replacing tags in email template '" +
                     emailMessageProperties.getSubject() + "'", e);
         }
@@ -494,9 +504,11 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         try {
             DeviceManagementDAOFactory.openConnection();
             device = deviceDAO.getDevice(deviceId, this.getTenantId());
-        } catch (DeviceManagementDAOException | SQLException e) {
+        } catch (DeviceManagementDAOException e) {
             throw new DeviceManagementException("Error occurred while obtaining the device for id " +
                     "'" + deviceId.getId() + "'", e);
+        } catch (SQLException e) {
+            throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
@@ -571,9 +583,11 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
 
             DeviceManagementDAOFactory.commitTransaction();
             return success;
-        } catch (DeviceManagementDAOException | TransactionManagementException e) {
+        } catch (DeviceManagementDAOException e) {
             DeviceManagementDAOFactory.rollbackTransaction();
             throw new DeviceManagementException("Error occurred while setting enrollment status", e);
+        } catch (TransactionManagementException e) {
+            throw new DeviceManagementException("Error occurred while initiating transaction", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
@@ -620,8 +634,8 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     }
 
     @Override
-    public int addOperation(Operation operation, List<DeviceIdentifier> devices) throws
+    public int addOperation(Operation operation,
-            OperationManagementException {
+                            List<DeviceIdentifier> devices) throws OperationManagementException {
         return DeviceManagementDataHolder.getInstance().getOperationManager().addOperation(operation, devices);
     }
 
@@ -652,8 +666,8 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     }
 
     @Override
-    public Operation getOperationByDeviceAndOperationId(DeviceIdentifier deviceId, int operationId)
+    public Operation getOperationByDeviceAndOperationId(DeviceIdentifier deviceId,
-            throws OperationManagementException {
+                                                        int operationId) throws OperationManagementException {
         return DeviceManagementDataHolder.getInstance().getOperationManager().getOperationByDeviceAndOperationId(
                 deviceId, operationId);
     }
@@ -678,9 +692,11 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         try {
             DeviceManagementDAOFactory.openConnection();
             userDevices = deviceDAO.getDevicesOfUser(username, this.getTenantId());
-        } catch (DeviceManagementDAOException | SQLException e) {
+        } catch (DeviceManagementDAOException e) {
             throw new DeviceManagementException("Error occurred while retrieving the list of devices that " +
                     "belong to the user '" + username + "'", e);
+        } catch (SQLException e) {
+            throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
@@ -749,8 +765,10 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         try {
             DeviceManagementDAOFactory.openConnection();
             return deviceDAO.getDeviceCount(this.getTenantId());
-        } catch (DeviceManagementDAOException | SQLException e) {
+        } catch (DeviceManagementDAOException e) {
             throw new DeviceManagementException("Error occurred while retrieving the device count", e);
+        } catch (SQLException e) {
+            throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
@@ -763,9 +781,11 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         try {
             DeviceManagementDAOFactory.openConnection();
             allDevices = deviceDAO.getDevicesByName(deviceName, this.getTenantId());
-        } catch (DeviceManagementDAOException | SQLException e) {
+        } catch (DeviceManagementDAOException e) {
             throw new DeviceManagementException("Error occurred while fetching the list of devices that matches to '"
                     + deviceName + "'", e);
+        } catch (SQLException e) {
+            throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
@@ -785,14 +805,22 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     @Override
     public void updateDeviceEnrolmentInfo(Device device, EnrolmentInfo.Status status) throws DeviceManagementException {
         try {
+            DeviceManagementDAOFactory.beginTransaction();
+
             DeviceType deviceType = deviceTypeDAO.getDeviceType(device.getType());
             device.getEnrolmentInfo().setDateOfLastUpdate(new Date().getTime());
             device.getEnrolmentInfo().setStatus(status);
             deviceDAO.updateDevice(deviceType.getId(), device, this.getTenantId());
-        } catch (DeviceManagementDAOException deviceDaoEx) {
+
-            String errorMsg = "Error occured update device enrolment status : " + device.getId();
+            DeviceManagementDAOFactory.commitTransaction();
-            log.error(errorMsg, deviceDaoEx);
+        } catch (DeviceManagementDAOException e) {
-            throw new DeviceManagementException(errorMsg, deviceDaoEx);
+            DeviceManagementDAOFactory.rollbackTransaction();
+            throw new DeviceManagementException("Error occurred update device enrolment status : '" +
+                    device.getId() + "'", e);
+        } catch (TransactionManagementException e) {
+            throw new DeviceManagementException("Error occurred while initiating transaction", e);
+        } finally {
+            DeviceManagementDAOFactory.closeConnection();
         }
     }
 
@@ -823,12 +851,13 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         try {
             DeviceManagementDAOFactory.openConnection();
             allDevices = deviceDAO.getDevicesByStatus(status, this.getTenantId());
-        } catch (DeviceManagementDAOException | SQLException e) {
+        } catch (DeviceManagementDAOException e) {
             throw new DeviceManagementException(
                     "Error occurred while fetching the list of devices that matches to status: '" + status + "'", e);
+        } catch (SQLException e) {
+            throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
-
         }
 
         for (Device device : allDevices) {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagementProviderServiceTest.java

@@ -42,7 +42,8 @@ public class ApplicationManagementProviderServiceTest {
     @BeforeClass
     public void init() {
         deviceManagementPluginRepository = new DeviceManagementPluginRepository();
-        TestDeviceManagementService testDeviceManagementService = new TestDeviceManagementService(TestDataHolder.TEST_DEVICE_TYPE);
+        TestDeviceManagementService testDeviceManagementService =
+                new TestDeviceManagementService(TestDataHolder.TEST_DEVICE_TYPE);
         try {
             deviceManagementPluginRepository.addDeviceManagementProvider(testDeviceManagementService);
         } catch (DeviceManagementException e) {
@@ -53,9 +54,9 @@ public class ApplicationManagementProviderServiceTest {
     }
 
     @Test
-    public void updateApplicationTest(){
+    public void updateApplicationTest() {
 
-        List<Application> applications = new ArrayList<Application>();
+        List<Application> applications = new ArrayList<>();
 
         Application application1 = TestDataHolder.generateApplicationDummyData("org.wso2.app1");
         Application application2 = TestDataHolder.generateApplicationDummyData("org.wso2.app2");
@@ -68,33 +69,42 @@ public class ApplicationManagementProviderServiceTest {
         applications.add(application4);
 
         Device device = TestDataHolder.initialTestDevice;
-        DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
+
-        deviceIdentifier.setId(TestDataHolder.initialDeviceIdentifier);
+        if (device == null) {
-        deviceIdentifier.setType(device.getType());
+            throw new IllegalStateException("Device information is not available");
+        }
+        DeviceIdentifier deviceId = new DeviceIdentifier();
+
+        String deviceIdentifier = TestDataHolder.initialDeviceIdentifier;
+        if (deviceIdentifier == null) {
+            throw new IllegalStateException("Device identifier is not available");
+        }
+        deviceId.setId(deviceIdentifier);
+        deviceId.setType(device.getType());
 
         AppManagementConfig appManagementConfig = new AppManagementConfig();
         appMgtProvider = new ApplicationManagerProviderServiceImpl(deviceManagementPluginRepository);
 
         try {
-            appMgtProvider.updateApplicationListInstalledInDevice(deviceIdentifier, applications);
+            appMgtProvider.updateApplicationListInstalledInDevice(deviceId, applications);
-        } catch (ApplicationManagementException appMgtEx){
+        } catch (ApplicationManagementException appMgtEx) {
             String msg = "Error occurred while updating app list '" + TestDataHolder.TEST_DEVICE_TYPE + "'";
             log.error(msg, appMgtEx);
             Assert.fail(msg, appMgtEx);
         }
 
         Application application5 = TestDataHolder.generateApplicationDummyData("org.wso2.app5");
-        applications = new ArrayList<Application>();
+        applications = new ArrayList<>();
         applications.add(application4);
         applications.add(application3);
         applications.add(application5);
 
         try {
-            appMgtProvider.updateApplicationListInstalledInDevice(deviceIdentifier, applications);
+            appMgtProvider.updateApplicationListInstalledInDevice(deviceId, applications);
-            List<Application> installedApps = appMgtProvider.getApplicationListForDevice(deviceIdentifier);
+            List<Application> installedApps = appMgtProvider.getApplicationListForDevice(deviceId);
-            log.info("Number of installed applications:"+installedApps.size());
+            log.info("Number of installed applications:" + installedApps.size());
-            Assert.assertEquals(installedApps.size(),3,"Num of installed applications should be two");
+            Assert.assertEquals(installedApps.size(), 3, "Num of installed applications should be two");
-        } catch (ApplicationManagementException appMgtEx){
+        } catch (ApplicationManagementException appMgtEx) {
             String msg = "Error occurred while updating app list '" + TestDataHolder.TEST_DEVICE_TYPE + "'";
             log.error(msg, appMgtEx);
             Assert.fail(msg, appMgtEx);

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/BaseDeviceManagementTest.java

@@ -72,7 +72,7 @@ public abstract class BaseDeviceManagementTest {
         return new org.apache.tomcat.jdbc.pool.DataSource(properties);
     }
 
-    private void initializeCarbonContext(){
+    private void initializeCarbonContext() {
 
         if (System.getProperty("carbon.home") == null) {
             File file = new File("src/test/resources/carbon-home");
@@ -129,11 +129,12 @@ public abstract class BaseDeviceManagementTest {
             conn = getDataSource().getConnection();
             conn.setAutoCommit(false);
 
-            this.cleanupEnrolmentData(conn);
+            //TODO:FIX ME
-            this.cleanApplicationMappingData(conn);
+//            this.cleanupEnrolmentData(conn);
-            this.cleanApplicationData(conn);
+//            this.cleanApplicationMappingData(conn);
-            this.cleanupDeviceData(conn);
+//            this.cleanApplicationData(conn);
-            this.cleanupDeviceTypeData(conn);
+//            this.cleanupDeviceData(conn);
+//            this.cleanupDeviceTypeData(conn);
 
             conn.commit();
         } catch (SQLException e) {
@@ -158,64 +159,34 @@ public abstract class BaseDeviceManagementTest {
         }
     }
 
-    private void cleanApplicationMappingData(Connection conn) throws SQLException{
+    private void cleanApplicationMappingData(Connection conn) throws SQLException {
-        PreparedStatement stmt = null;
+        try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_DEVICE_APPLICATION_MAPPING")) {
-        try {
-            stmt = conn.prepareStatement("DELETE FROM DM_DEVICE_APPLICATION_MAPPING");
             stmt.execute();
-        } finally {
-            if (stmt != null) {
-                stmt.close();
-            }
         }
     }
 
-    private void cleanApplicationData(Connection conn) throws SQLException{
+    private void cleanApplicationData(Connection conn) throws SQLException {
-        PreparedStatement stmt = null;
+        try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_APPLICATION")) {
-        try {
-            stmt = conn.prepareStatement("DELETE FROM DM_APPLICATION");
             stmt.execute();
-        } finally {
-            if (stmt != null) {
-                stmt.close();
-            }
         }
     }
 
 
     private void cleanupEnrolmentData(Connection conn) throws SQLException {
-        PreparedStatement stmt = null;
+        try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_ENROLMENT")) {
-        try {
-            stmt = conn.prepareStatement("DELETE FROM DM_ENROLMENT");
             stmt.execute();
-        } finally {
-            if (stmt != null) {
-                stmt.close();
-            }
         }
     }
 
     private void cleanupDeviceData(Connection conn) throws SQLException {
-        PreparedStatement stmt = null;
+        try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_DEVICE")) {
-        try {
-            stmt = conn.prepareStatement("DELETE FROM DM_DEVICE");
             stmt.execute();
-        } finally {
-            if (stmt != null) {
-                stmt.close();
-            }
         }
     }
 
     private void cleanupDeviceTypeData(Connection conn) throws SQLException {
-        PreparedStatement stmt = null;
+        try (PreparedStatement stmt = conn.prepareStatement("DELETE FROM DM_DEVICE_TYPE")) {
-        try {
-            stmt = conn.prepareStatement("DELETE FROM DM_DEVICE_TYPE");
             stmt.execute();
-        } finally {
-            if (stmt != null) {
-                stmt.close();
-            }
         }
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DevicePersistTests.java

@@ -26,6 +26,7 @@ import org.testng.annotations.Test;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo.Status;
+import org.wso2.carbon.device.mgt.common.TransactionManagementException;
 import org.wso2.carbon.device.mgt.core.TestUtils;
 import org.wso2.carbon.device.mgt.core.common.BaseDeviceManagementTest;
 import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
@@ -50,12 +51,18 @@ public class DevicePersistTests extends BaseDeviceManagementTest {
     public void testAddDeviceTypeTest() {
         DeviceType deviceType = TestDataHolder.generateDeviceTypeData(TestDataHolder.TEST_DEVICE_TYPE);
         try {
-            DeviceManagementDAOFactory.openConnection();
+            DeviceManagementDAOFactory.beginTransaction();
             deviceTypeDAO.addDeviceType(deviceType);
-        } catch (DeviceManagementDAOException | SQLException e) {
+        } catch (DeviceManagementDAOException e) {
+            DeviceManagementDAOFactory.rollbackTransaction();
             String msg = "Error occurred while adding device type '" + deviceType.getName() + "'";
             log.error(msg, e);
             Assert.fail(msg, e);
+        } catch (TransactionManagementException e) {
+            String msg = "Error occurred while initiating transaction to persist device type '" +
+                    deviceType.getName() + "'";
+            log.error(msg, e);
+            Assert.fail(msg, e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
@@ -75,21 +82,26 @@ public class DevicePersistTests extends BaseDeviceManagementTest {
 
     @Test(dependsOnMethods = {"testAddDeviceTypeTest"})
     public void testAddDeviceTest() {
-
         int tenantId = TestDataHolder.SUPER_TENANT_ID;
         Device device = TestDataHolder.generateDummyDeviceData(TestDataHolder.TEST_DEVICE_TYPE);
 
         try {
-            DeviceManagementDAOFactory.openConnection();
+            DeviceManagementDAOFactory.beginTransaction();
             int deviceId = deviceDAO.addDevice(TestDataHolder.initialTestDeviceType.getId(), device, tenantId);
             device.setId(deviceId);
             deviceDAO.addEnrollment(device, tenantId);
+            DeviceManagementDAOFactory.commitTransaction();
             TestDataHolder.initialTestDevice = device;
-        } catch (DeviceManagementDAOException | SQLException e) {
+        } catch (DeviceManagementDAOException e) {
+            DeviceManagementDAOFactory.rollbackTransaction();
             String msg = "Error occurred while adding '" + device.getType() + "' device with the identifier '" +
                     device.getDeviceIdentifier() + "'";
             log.error(msg, e);
             Assert.fail(msg, e);
+        } catch (TransactionManagementException e) {
+            String msg = "Error occurred while initiating transaction";
+            log.error(msg, e);
+            Assert.fail(msg, e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
@@ -164,14 +176,19 @@ public class DevicePersistTests extends BaseDeviceManagementTest {
 
         Device device = TestDataHolder.initialTestDevice;
         try {
-            DeviceManagementDAOFactory.openConnection();
+            DeviceManagementDAOFactory.beginTransaction();
             DeviceIdentifier deviceId = new DeviceIdentifier(device.getDeviceIdentifier(), device.getType());
             deviceDAO.setEnrolmentStatus(deviceId, device.getEnrolmentInfo().getOwner(), Status.ACTIVE,
                     TestDataHolder.SUPER_TENANT_ID);
-        } catch (DeviceManagementDAOException | SQLException e) {
+        } catch (DeviceManagementDAOException e) {
+            DeviceManagementDAOFactory.rollbackTransaction();
             String msg = "Error occurred while setting enrolment status";
             log.error(msg, e);
             Assert.fail(msg, e);
+        } catch (TransactionManagementException e) {
+            String msg = "Error occurred while initiating transaction";
+            log.error(msg, e);
+            Assert.fail(msg, e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/PolicyManagementDAOFactory.java

@@ -20,6 +20,7 @@ package org.wso2.carbon.policy.mgt.core.dao;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.mgt.common.IllegalTransactionStateException;
 import org.wso2.carbon.policy.mgt.core.config.datasource.DataSourceConfig;
 import org.wso2.carbon.policy.mgt.core.config.datasource.JNDILookupDefinition;
 import org.wso2.carbon.policy.mgt.core.dao.impl.FeatureDAOImpl;
@@ -38,7 +39,7 @@ public class PolicyManagementDAOFactory {
 
     private static DataSource dataSource;
     private static final Log log = LogFactory.getLog(PolicyManagementDAOFactory.class);
-    private static ThreadLocal<Connection> currentConnection = new ThreadLocal<Connection>();
+    private static ThreadLocal<Connection> currentConnection = new ThreadLocal<>();
 
     public static void init(DataSourceConfig config) {
         dataSource = resolveDataSource(config);
@@ -48,13 +49,6 @@ public class PolicyManagementDAOFactory {
         dataSource = dtSource;
     }
 
-    public static DataSource getDataSource() {
-        if (dataSource != null) {
-            return dataSource;
-        }
-        throw new RuntimeException("Data source is not yet configured.");
-    }
-
     public static PolicyDAO getPolicyDAO() {
         return new PolicyDAOImpl();
     }
@@ -91,7 +85,7 @@ public class PolicyManagementDAOFactory {
             List<JNDILookupDefinition.JNDIProperty> jndiPropertyList =
                     jndiConfig.getJndiProperties();
             if (jndiPropertyList != null) {
-                Hashtable<Object, Object> jndiProperties = new Hashtable<Object, Object>();
+                Hashtable<Object, Object> jndiProperties = new Hashtable<>();
                 for (JNDILookupDefinition.JNDIProperty prop : jndiPropertyList) {
                     jndiProperties.put(prop.getName(), prop.getValue());
                 }
@@ -104,8 +98,14 @@ public class PolicyManagementDAOFactory {
     }
 
     public static void beginTransaction() throws PolicyManagerDAOException {
+        Connection conn = currentConnection.get();
+        if (conn != null) {
+            throw new IllegalTransactionStateException("A transaction is already active within the context of " +
+                    "this particular thread. Therefore, calling 'beginTransaction/openConnection' while another " +
+                    "transaction is already active is a sign of improper transaction handling");
+        }
         try {
-            Connection conn = dataSource.getConnection();
+            conn = dataSource.getConnection();
             conn.setAutoCommit(false);
             currentConnection.set(conn);
         } catch (SQLException e) {
@@ -113,63 +113,68 @@ public class PolicyManagementDAOFactory {
         }
     }
 
-    public static Connection getConnection() throws PolicyManagerDAOException {
+    public static Connection getConnection() {
-        if (currentConnection.get() == null) {
+        Connection conn = currentConnection.get();
-            try {
+        if (conn == null) {
-                Connection conn = dataSource.getConnection();
+            throw new IllegalTransactionStateException("No connection is associated with the current transaction. " +
-                conn.setAutoCommit(false);
+                    "This might have ideally been caused by not properly initiating the transaction via " +
-                currentConnection.set(conn);
+                    "'beginTransaction'/'openConnection' methods");
-            } catch (SQLException e) {
-                throw new PolicyManagerDAOException("Error occurred while retrieving data source connection", e);
-            }
         }
-        return currentConnection.get();
+        return conn;
     }
 
     public static void closeConnection() {
-        Connection con = currentConnection.get();
+        Connection conn = currentConnection.get();
+        if (conn == null) {
+            throw new IllegalTransactionStateException("No connection is associated with the current transaction. " +
+                    "This might have ideally been caused by not properly initiating the transaction via " +
+                    "'beginTransaction'/'openConnection' methods");
+        }
         try {
-            con.close();
+            conn.close();
         } catch (SQLException e) {
             log.warn("Error occurred while close the connection", e);
         }
         currentConnection.remove();
     }
 
-    public static void commitTransaction() throws PolicyManagerDAOException {
+    public static void commitTransaction() {
-        try {
         Connection conn = currentConnection.get();
-            if (conn != null) {
+        if (conn == null) {
-                conn.commit();
+            throw new IllegalTransactionStateException("No connection is associated with the current transaction. " +
-            } else {
+                    "This might have ideally been caused by not properly initiating the transaction via " +
-                if (log.isDebugEnabled()) {
+                    "'beginTransaction'/'openConnection' methods");
-                    log.debug("Datasource connection associated with the current thread is null, hence commit " +
-                        "has not been attempted");
-                }
         }
+        try {
+            conn.commit();
         } catch (SQLException e) {
-            throw new PolicyManagerDAOException("Error occurred while committing the transaction", e);
+            log.error("Error occurred while committing the transaction", e);
         }
     }
 
     public static void rollbackTransaction() {
-        try {
         Connection conn = currentConnection.get();
-            if (conn != null) {
+        if (conn == null) {
-                conn.rollback();
+            throw new IllegalTransactionStateException("No connection is associated with the current transaction. " +
-            } else {
+                    "This might have ideally been caused by not properly initiating the transaction via " +
-                if (log.isDebugEnabled()) {
+                    "'beginTransaction'/'openConnection' methods");
-                    log.debug("Datasource connection associated with the current thread is null, hence rollback " +
-                        "has not been attempted");
-                }
         }
+        try {
+            conn.rollback();
         } catch (SQLException e) {
             log.warn("Error occurred while roll-backing the transaction", e);
         }
     }
 
     public static void openConnection() throws SQLException {
-        currentConnection.set(dataSource.getConnection());
+        Connection conn = currentConnection.get();
+        if (conn != null) {
+            throw new IllegalTransactionStateException("A transaction is already active within the context of " +
+                    "this particular thread. Therefore, calling 'beginTransaction/openConnection' while another " +
+                    "transaction is already active is a sign of improper transaction handling");
+        }
+        conn = dataSource.getConnection();
+        currentConnection.set(conn);
     }
 
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/FeatureDAOImpl.java

@@ -362,12 +362,7 @@ public class FeatureDAOImpl implements FeatureDAO {
     }
 
     private Connection getConnection() throws FeatureManagerDAOException {
-        try {
         return PolicyManagementDAOFactory.getConnection();
-        } catch (PolicyManagerDAOException e) {
-            throw new FeatureManagerDAOException("Error occurred while obtaining a connection from the policy " +
-                    "management metadata repository config.datasource", e);
-        }
     }
 
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/MonitoringDAOImpl.java

@@ -382,12 +382,7 @@ public class MonitoringDAOImpl implements MonitoringDAO {
     }
 
     private Connection getConnection() throws MonitoringDAOException {
-        try {
         return PolicyManagementDAOFactory.getConnection();
-        } catch (PolicyManagerDAOException e) {
-            throw new MonitoringDAOException("Error occurred while obtaining a connection from the policy " +
-                    "management metadata repository config.datasource", e);
-        }
     }
 
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/PolicyDAOImpl.java

@@ -1308,7 +1308,7 @@ public class PolicyDAOImpl implements PolicyDAO {
             stmt.setInt(3, enrollmentId);
             resultSet = stmt.executeQuery();
 
-            while (resultSet.next()) {
+            if (resultSet.next()) {
                 return resultSet.getInt("POLICY_ID");
             }
         } catch (SQLException e) {

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/ProfileDAOImpl.java

@@ -28,7 +28,6 @@ import org.wso2.carbon.policy.mgt.core.dao.PolicyManagerDAOException;
 import org.wso2.carbon.policy.mgt.core.dao.ProfileDAO;
 import org.wso2.carbon.policy.mgt.core.dao.ProfileManagerDAOException;
 import org.wso2.carbon.policy.mgt.core.dao.util.PolicyManagementDAOUtil;
-import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -220,7 +219,7 @@ public class ProfileDAOImpl implements ProfileDAO {
         Connection conn;
         PreparedStatement stmt = null;
         ResultSet resultSet = null;
-        List<Profile> profileList = new ArrayList<Profile>();
+        List<Profile> profileList = new ArrayList<>();
 
         try {
             //TODO : Fix with TenantID.
@@ -261,8 +260,7 @@ public class ProfileDAOImpl implements ProfileDAO {
         Connection conn;
         PreparedStatement stmt = null;
         ResultSet resultSet = null;
-        List<Profile> profileList = new ArrayList<Profile>();
+        List<Profile> profileList = new ArrayList<>();
-
         try {
             conn = this.getConnection();
             String query = "SELECT * FROM DM_PROFILE WHERE DEVICE_TYPE_ID = ?";
@@ -281,7 +279,6 @@ public class ProfileDAOImpl implements ProfileDAO {
 
                 profileList.add(profile);
             }
-
         } catch (SQLException e) {
             String msg = "Error occurred while reading the profile list from the database.";
             log.error(msg, e);
@@ -294,12 +291,7 @@ public class ProfileDAOImpl implements ProfileDAO {
 
 
     private Connection getConnection() throws ProfileManagerDAOException {
-        try {
         return PolicyManagementDAOFactory.getConnection();
-        } catch (PolicyManagerDAOException e) {
-            throw new ProfileManagerDAOException("Error occurred while obtaining a connection from the policy " +
-                    "management metadata repository config.datasource", e);
-        }
     }
 
 }

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/enforcement/DelegationTask.java

@@ -16,7 +16,6 @@
  * under the License.
  */
 
-
 package org.wso2.carbon.policy.mgt.core.enforcement;
 
 import org.apache.commons.logging.Log;

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/PolicyManagerImpl.java

@@ -20,10 +20,12 @@ package org.wso2.carbon.policy.mgt.core.mgt.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceDAO;
+import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
@@ -47,12 +49,14 @@ public class PolicyManagerImpl implements PolicyManager {
     private FeatureDAO featureDAO;
     private ProfileManager profileManager;
     private PolicyCacheManager policyCacheManager;
+    private DeviceDAO deviceDAO;
     private static Log log = LogFactory.getLog(PolicyManagerImpl.class);
 
     public PolicyManagerImpl() {
         this.policyDAO = PolicyManagementDAOFactory.getPolicyDAO();
         this.profileDAO = PolicyManagementDAOFactory.getProfileDAO();
         this.featureDAO = PolicyManagementDAOFactory.getFeatureDAO();
+        this.deviceDAO = DeviceManagementDAOFactory.getDeviceDAO();
         this.profileManager = new ProfileManagerImpl();
     }
 
@@ -316,14 +320,18 @@ public class PolicyManagerImpl implements PolicyManager {
     @Override
     public Policy addPolicyToDevice(List<DeviceIdentifier> deviceIdentifierList,
                                     Policy policy) throws PolicyManagementException {
-        try {
 
         List<Device> deviceList = new ArrayList<>();
         DeviceManagementProviderService service = new DeviceManagementProviderServiceImpl();
         for (DeviceIdentifier deviceIdentifier : deviceIdentifierList) {
-                deviceList.add(service.getDevice(deviceIdentifier));
+            try {
+                Device device = service.getDevice(deviceIdentifier);
+                deviceList.add(device);
+            } catch (DeviceManagementException e) {
+                throw new PolicyManagementException("Error occurred while retrieving device information", e);
             }
-
+        }
+        try {
             PolicyManagementDAOFactory.beginTransaction();
             if (policy.getId() == 0) {
                 policyDAO.addPolicy(policy);
@@ -347,9 +355,6 @@ public class PolicyManagerImpl implements PolicyManager {
             PolicyManagementDAOFactory.rollbackTransaction();
             throw new PolicyManagementException("Error occurred while adding the policy ("
                     + policy.getId() + " - " + policy.getPolicyName() + ")", e);
-        } catch (DeviceManagementException e) {
-            PolicyManagementDAOFactory.rollbackTransaction();
-            throw new PolicyManagementException("Error occurred while adding the policy to device list", e);
         } finally {
             PolicyManagementDAOFactory.closeConnection();
         }
@@ -668,11 +673,13 @@ public class PolicyManagerImpl implements PolicyManager {
 
         List<Device> deviceList = new ArrayList<>();
         List<Integer> deviceIds;
+        int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
         try {
             DeviceManagementProviderService service = new DeviceManagementProviderServiceImpl();
             List<Device> allDevices = service.getAllDevices();
 
             PolicyManagementDAOFactory.openConnection();
+
             //int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
             deviceIds = policyDAO.getPolicyAppliedDevicesIds(policyId);
 
@@ -707,6 +714,21 @@ public class PolicyManagerImpl implements PolicyManager {
         } finally {
             PolicyManagementDAOFactory.closeConnection();
         }
+
+        try {
+            DeviceManagementDAOFactory.openConnection();
+            for (int deviceId : deviceIds) {
+                //TODO FIX ME
+                deviceList.add(deviceDAO.getDevice(new DeviceIdentifier(Integer.toString(deviceId), ""), tenantId));
+            }
+        } catch (SQLException e) {
+            throw new PolicyManagementException("Error occurred while opening a connection to the data source", e);
+        } catch (DeviceManagementDAOException e) {
+            throw new PolicyManagementException("Error occurred while retrieving device metadata", e);
+        } finally {
+            DeviceManagementDAOFactory.closeConnection();
+        }
+
         return deviceList;
     }
 

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/ProfileManagerImpl.java

@@ -143,15 +143,13 @@ public class ProfileManagerImpl implements ProfileManager {
     public Profile getProfile(int profileId) throws ProfileManagementException {
         Profile profile;
         List<ProfileFeature> featureList;
-        DeviceType deviceType;
+        DeviceType deviceType = null;
 
         try {
             PolicyManagementDAOFactory.openConnection();
             profile = profileDAO.getProfile(profileId);
             featureList = featureDAO.getFeaturesForProfile(profileId);
-
             profile.setProfileFeaturesList(featureList);
-
         } catch (ProfileManagerDAOException e) {
             throw new ProfileManagementException("Error occurred while getting profile id (" + profileId + ")", e);
         } catch (FeatureManagerDAOException e) {
@@ -161,7 +159,6 @@ public class ProfileManagerImpl implements ProfileManager {
             throw new ProfileManagementException("Error occurred while opening a connection to the data source", e);
         } finally {
             PolicyManagementDAOFactory.closeConnection();
-
         }
 
         try {
@@ -185,14 +182,19 @@ public class ProfileManagerImpl implements ProfileManager {
     public List<Profile> getAllProfiles() throws ProfileManagementException {
         List<Profile> profileList;
         List<DeviceType> deviceTypes;
-        try {
+
         try {
             DeviceManagementDAOFactory.openConnection();
             deviceTypes = deviceTypeDAO.getDeviceTypes();
+        } catch (SQLException e) {
+            throw new ProfileManagementException("Error occurred while opening a connection to the data source", e);
+        } catch (DeviceManagementDAOException e) {
+            throw new ProfileManagementException("Error occurred while retrieving device type information", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
 
+        try {
             PolicyManagementDAOFactory.openConnection();
             profileList = profileDAO.getAllProfiles();
             List<ProfileFeature> featureList = featureDAO.getAllProfileFeatures();
@@ -217,8 +219,6 @@ public class ProfileManagerImpl implements ProfileManager {
             throw new ProfileManagementException("Error occurred while getting profiles", e);
         } catch (FeatureManagerDAOException e) {
             throw new ProfileManagementException("Error occurred while getting features related to profiles", e);
-        } catch (DeviceManagementDAOException e) {
-            throw new ProfileManagementException("Error occurred while getting device types related to profiles", e);
         } catch (SQLException e) {
             throw new ProfileManagementException("Error occurred while opening a connection to the data source", e);
         } finally {
@@ -233,13 +233,19 @@ public class ProfileManagerImpl implements ProfileManager {
         List<Profile> profileList;
         List<ProfileFeature> featureList;
         DeviceType deviceType;
-        try {
+
         try {
             DeviceManagementDAOFactory.openConnection();
             deviceType = deviceTypeDAO.getDeviceType(deviceTypeName);
+        } catch (DeviceManagementDAOException e) {
+            throw new ProfileManagementException("Error occurred while retrieving device type information", e);
+        } catch (SQLException e) {
+            throw new ProfileManagementException("Error occurred while opening a connection to the data source", e);
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
+
+        try {
             PolicyManagementDAOFactory.openConnection();
 
             profileList = profileDAO.getProfilesOfDeviceType(deviceType);
@@ -253,12 +259,9 @@ public class ProfileManagerImpl implements ProfileManager {
                     }
                 }
                 profile.setProfileFeaturesList(profileFeatureList);
-
             }
         } catch (ProfileManagerDAOException e) {
             throw new ProfileManagementException("Error occurred while getting profiles", e);
-        } catch (DeviceManagementDAOException e) {
-            throw new ProfileManagementException("Error occurred while getting device types", e);
         } catch (FeatureManagerDAOException e) {
             throw new ProfileManagementException("Error occurred while getting profile features types", e);
         } catch (SQLException e) {

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/MonitoringTestCase.java

@@ -53,11 +53,12 @@ public class MonitoringTestCase extends BasePolicyManagementDAOTest {
 
     private static final String ANDROID = "android";
 
-    DeviceIdentifier identifier = new DeviceIdentifier();
+    private DeviceIdentifier identifier = new DeviceIdentifier();
 
     @BeforeClass
     @Override
     public void init() throws Exception {
+
     }
 
     @Test

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/PolicyDAOTestCase.java

@@ -21,19 +21,21 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import org.wso2.carbon.device.mgt.common.Device;
+import org.wso2.carbon.device.mgt.common.*;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.device.mgt.core.dao.*;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
 import org.wso2.carbon.policy.mgt.common.*;
+import org.wso2.carbon.policy.mgt.common.FeatureManagementException;
+import org.wso2.carbon.policy.mgt.core.dao.PolicyManagementDAOFactory;
+import org.wso2.carbon.policy.mgt.core.dao.PolicyManagerDAOException;
 import org.wso2.carbon.policy.mgt.core.impl.PolicyAdministratorPointImpl;
 import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
 import org.wso2.carbon.policy.mgt.core.util.*;
 
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -58,16 +60,28 @@ public class PolicyDAOTestCase extends BasePolicyManagementDAOTest {
 
     @Test
     public void addDeviceType() throws DeviceManagementDAOException {
+        try {
+            DeviceManagementDAOFactory.beginTransaction();
             DeviceTypeDAO deviceTypeDAO = DeviceManagementDAOFactory.getDeviceTypeDAO();
             deviceTypeDAO.addDeviceType(DeviceTypeCreator.getDeviceType());
+        } catch (DeviceManagementDAOException e) {
+            DeviceManagementDAOFactory.rollbackTransaction();
+            throw new DeviceManagementDAOException("Error occurred while adding dummy device type", e);
+        } catch (TransactionManagementException e) {
+            throw new DeviceManagementDAOException("Error occurred while initiating a transaction to add dummy " +
+                    "device type", e);
+        } finally {
+            DeviceManagementDAOFactory.closeConnection();
+        }
     }
 
 
     @Test(dependsOnMethods = ("addDeviceType"))
-    public void addDevice() throws DeviceManagementDAOException, DeviceManagementException {
+    public void addDevice() throws DeviceManagementException, PolicyManagementException {
 
         DeviceDAO deviceDAO = DeviceManagementDAOFactory.getDeviceDAO();
         EnrolmentDAO enrolmentDAO = DeviceManagementDAOFactory.getEnrollmentDAO();
+
         DeviceType type = DeviceTypeCreator.getDeviceType();
         devices = DeviceCreator.getDeviceList(type);
         devices.addAll(DeviceCreator.getDeviceList2(type));
@@ -75,10 +89,21 @@ public class PolicyDAOTestCase extends BasePolicyManagementDAOTest {
         devices.addAll(DeviceCreator.getDeviceList4(type));
         devices.addAll(DeviceCreator.getDeviceList5(type));
         devices.addAll(DeviceCreator.getDeviceList6(type));
+
+        try {
+            DeviceManagementDAOFactory.beginTransaction();
             for (Device device : devices) {
                 int id = deviceDAO.addDevice(type.getId(), device, -1234);
                 enrolmentDAO.addEnrollment(id, device.getEnrolmentInfo(), -1234);
             }
+        } catch (TransactionManagementException e) {
+            throw new PolicyManagementException("Error occurred while adding device enrolment", e);
+        } catch (DeviceManagementDAOException e) {
+            DeviceManagementDAOFactory.rollbackTransaction();
+            throw new PolicyManagementException("Error occurred while adding device information", e);
+        } finally {
+            DeviceManagementDAOFactory.closeConnection();
+        }
 
 
         DeviceManagementProviderService service = new DeviceManagementProviderServiceImpl();
@@ -376,8 +401,6 @@ public class PolicyDAOTestCase extends BasePolicyManagementDAOTest {
         for (Device device : devices) {
             log.debug("Device Name : " + device.getDeviceIdentifier());
         }
-
     }
 
-
 }