Merge branch 'fix-geofence' into 'master'

Fix invalid DAO factory handling & invalid event revoke payload

See merge request entgra/carbon-device-mgt!865
temp
Pahansith Gunathilake 3 years ago
commit aa2234dcdd

@ -21,8 +21,8 @@ package org.wso2.carbon.device.mgt.core.dao.impl.event;
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.event.config.EventConfig; import org.wso2.carbon.device.mgt.common.event.config.EventConfig;
import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
import org.wso2.carbon.device.mgt.core.dao.EventManagementDAOException; import org.wso2.carbon.device.mgt.core.dao.EventManagementDAOException;
import org.wso2.carbon.device.mgt.core.dao.EventManagementDAOFactory;
import org.wso2.carbon.device.mgt.core.dao.impl.AbstractEventConfigDAO; import org.wso2.carbon.device.mgt.core.dao.impl.AbstractEventConfigDAO;
import java.sql.Connection; import java.sql.Connection;
@ -76,6 +76,6 @@ public class GenericEventConfigDAOImpl extends AbstractEventConfigDAO {
} }
private Connection getConnection() throws SQLException { private Connection getConnection() throws SQLException {
return DeviceManagementDAOFactory.getConnection(); return EventManagementDAOFactory.getConnection();
} }
} }

Loading…
Cancel
Save