community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fix windows enrollment issue

See merge request entgra/carbon-device-mgt-plugins!36
This commit is contained in:
Ruwan Yatawara 2019-05-28 05:05:14 +00:00
commit 88047e03fa
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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
View File

@ -51,7 +51,8 @@ public class WindowsTokenServiceImpl implements WindowsTokenService {
return cacheEntry;
}
@Override public MobileCacheEntry getCacheTokenFromDeviceId(String deviceId)
@Override
public MobileCacheEntry getCacheTokenFromDeviceId(String deviceId)
throws MobileDeviceManagementDAOException {
MobileCacheEntry cacheEntry = null;
try {

11
components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/dao/WindowsDAOFactory.java
View File

@ -20,8 +20,6 @@ package org.wso2.carbon.device.mgt.mobile.windows.impl.dao;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
import org.wso2.carbon.device.mgt.mobile.windows.exception.WindowsDeviceMgtPluginException;
import org.wso2.carbon.device.mgt.mobile.windows.impl.dao.impl.WindowsDeviceDAOImpl;
import org.wso2.carbon.device.mgt.mobile.windows.impl.dao.impl.WindowsFeatureDAOImpl;
@ -77,6 +75,15 @@ public class WindowsDAOFactory extends AbstractMobileDeviceManagementDAOFactory
if (currentConnection.get() == null) {
Connection conn;
try {
if (dataSource == null) {
try {
String dataSourceName = "jdbc/MobileWindowsDM_DS";
Context ctx = new InitialContext();
dataSource = (DataSource) ctx.lookup(dataSourceName);
} catch (NamingException e) {
throw new MobileDeviceManagementDAOException("Error occurred while initializing datasource", e);
}
}
conn = dataSource.getConnection();
currentConnection.set(conn);
} catch (SQLException e) {