community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify error messages and exception handling

Browse Source
This commit is contained in:
Saad Sahibjan 2019-08-08 16:39:18 +05:30
parent 0d203e0cd5
commit f0103f27c4
1 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/DeviceTypeDAOHandler.java
View File

@ -70,25 +70,21 @@ public class DeviceTypeDAOHandler {
return currentConnection.get();
}
public void commitTransaction() throws DeviceTypeMgtPluginException {
public void commitTransaction() {
Connection conn = currentConnection.get();
if (conn == null) {
throw new IllegalStateException("No connection is associated with the current transaction. " +
"This might have ideally been caused by not properly initiating the " +
"transaction via 'beginTransaction'/'openConnection' methods");
}
try {
Connection conn = currentConnection.get();
if (conn != null) {
conn.commit();
} else {
if (log.isDebugEnabled()) {
log.debug("Datasource connection associated with the current thread is null, hence commit "
+ "has not been attempted");
}
}
conn.commit();
} catch (SQLException e) {
throw new DeviceTypeMgtPluginException("Error occurred while committing the transaction", e);
} finally {
closeConnection();
log.error("Error occurred while committing the transaction.", e);
}
}
public void closeConnection() throws DeviceTypeMgtPluginException {
public void closeConnection() {
Connection con = currentConnection.get();
if (con != null) {
@ -101,21 +97,17 @@ public class DeviceTypeDAOHandler {
currentConnection.remove();
}
public void rollbackTransaction() throws DeviceTypeMgtPluginException {
public void rollbackTransaction() {
Connection conn = currentConnection.get();
if (conn == null) {
throw new IllegalStateException("No connection is associated with the current transaction. " +
"This might have ideally been caused by not properly initiating the " +
"transaction via 'beginTransaction'/'openConnection' methods");
}
try {
Connection conn = currentConnection.get();
if (conn != null) {
conn.rollback();
} else {
if (log.isDebugEnabled()) {
log.debug("Datasource connection associated with the current thread is null, hence rollback "
+ "has not been attempted");
}
}
conn.rollback();
} catch (SQLException e) {
throw new DeviceTypeMgtPluginException("Error occurred while rollback the transaction", e);
} finally {
closeConnection();
log.error("Error occurred while roll-backing the transaction.", e);
}
}
}