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

Fix windows enrollment issue

Browse Source
This commit is contained in:
Pahansith 2019-04-29 23:25:37 +05:30
parent 4226755991
commit b04acfdf53
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
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

@ -16,7 +16,6 @@ public class WindowsTokenServiceImpl implements WindowsTokenService {
public WindowsTokenServiceImpl() { public WindowsTokenServiceImpl() {
windowsEnrollmentTokenDAO = new WindowsEnrollmentTokenDAOImpl(); windowsEnrollmentTokenDAO = new WindowsEnrollmentTokenDAOImpl();
WindowsDAOFactory windowsDAOFactory = new WindowsDAOFactory();
} }
@Override @Override

9
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

@ -77,6 +77,15 @@ public class WindowsDAOFactory extends AbstractMobileDeviceManagementDAOFactory
if (currentConnection.get() == null) { if (currentConnection.get() == null) {
Connection conn; Connection conn;
try { 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(); conn = dataSource.getConnection();
currentConnection.set(conn); currentConnection.set(conn);
} catch (SQLException e) { } catch (SQLException e) {