community
/
device-mgt-plugins
10
0
Fork 39
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #816 from harshanL/master

Browse Source 
Resolved wso2/product-iots#1390
merge-requests/1/head
Hasunie 7 years ago committed by GitHub
parent 430531c56b e81a90510f
commit 9b452480ef
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File

9
components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsTokenServiceImpl.java
Unescape View File

@ -2,8 +2,6 @@ package org.wso2.carbon.device.mgt.mobile.windows.impl;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.device.mgt.common.TransactionManagementException;
import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
import org.wso2.carbon.device.mgt.mobile.windows.impl.dao.MobileDeviceManagementDAOException; import org.wso2.carbon.device.mgt.mobile.windows.impl.dao.MobileDeviceManagementDAOException;
import org.wso2.carbon.device.mgt.mobile.windows.impl.dao.WindowsDAOFactory; import org.wso2.carbon.device.mgt.mobile.windows.impl.dao.WindowsDAOFactory;
import org.wso2.carbon.device.mgt.mobile.windows.impl.dao.WindowsEnrollmentTokenDAO; import org.wso2.carbon.device.mgt.mobile.windows.impl.dao.WindowsEnrollmentTokenDAO;
@ -16,7 +14,6 @@ public class WindowsTokenServiceImpl implements WindowsTokenService {
private static WindowsEnrollmentTokenDAO windowsEnrollmentTokenDAO; private static WindowsEnrollmentTokenDAO windowsEnrollmentTokenDAO;
public WindowsTokenServiceImpl() { public WindowsTokenServiceImpl() {
WindowsDAOFactory windowsDAOFactory = new WindowsDAOFactory();
windowsEnrollmentTokenDAO = new WindowsEnrollmentTokenDAOImpl(); windowsEnrollmentTokenDAO = new WindowsEnrollmentTokenDAOImpl();
} }
@ -46,9 +43,8 @@ public class WindowsTokenServiceImpl implements WindowsTokenService {
public MobileCacheEntry getCacheToken(String token) throws MobileDeviceManagementDAOException { public MobileCacheEntry getCacheToken(String token) throws MobileDeviceManagementDAOException {
MobileCacheEntry cacheEntry = null; MobileCacheEntry cacheEntry = null;
try { try {
WindowsDAOFactory.beginTransaction(); WindowsDAOFactory.openConnection();
cacheEntry = windowsEnrollmentTokenDAO.getCacheToken(token); cacheEntry = windowsEnrollmentTokenDAO.getCacheToken(token);
WindowsDAOFactory.commitTransaction();
} finally { } finally {
WindowsDAOFactory.closeConnection(); WindowsDAOFactory.closeConnection();
} }
@ -59,9 +55,8 @@ public class WindowsTokenServiceImpl implements WindowsTokenService {
throws MobileDeviceManagementDAOException { throws MobileDeviceManagementDAOException {
MobileCacheEntry cacheEntry = null; MobileCacheEntry cacheEntry = null;
try { try {
WindowsDAOFactory.beginTransaction(); WindowsDAOFactory.openConnection();
cacheEntry = windowsEnrollmentTokenDAO.getCacheTokenFromDeviceId(deviceId); cacheEntry = windowsEnrollmentTokenDAO.getCacheTokenFromDeviceId(deviceId);
WindowsDAOFactory.commitTransaction();
} finally { } finally {
WindowsDAOFactory.closeConnection(); WindowsDAOFactory.closeConnection();
} }

Write Preview
Loading…
Cancel
Save