From 7701015ea095009e6f04517edd8e128644e45e14 Mon Sep 17 00:00:00 2001 From: hasuniea Date: Fri, 30 Oct 2015 20:12:26 +0530 Subject: [PATCH] refactored code conflicts --- .../mobile/impl/windows/dao/impl/WindowsFeatureDAOImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/dao/impl/WindowsFeatureDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/dao/impl/WindowsFeatureDAOImpl.java index 8b5d11a933..da1bdfa474 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/dao/impl/WindowsFeatureDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/dao/impl/WindowsFeatureDAOImpl.java @@ -120,10 +120,8 @@ public class WindowsFeatureDAOImpl implements MobileFeatureDAO { } } } catch (SQLException e) { - String msg = "Error occurred while updating the Windows Feature '" + - mobileFeature.getCode() + "' to the Android db."; - log.error(msg, e); - throw new WindowsFeatureManagementDAOException(msg, e); + throw new WindowsFeatureManagementDAOException("Error occurred while updating the Windows Feature '" + + mobileFeature.getCode() + "' to the Windows db.", e); } finally { MobileDeviceManagementDAOUtil.cleanupResources(stmt, null); }