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

Addressing review comments

Browse Source
This commit is contained in:
Ace 2020-12-07 13:27:57 +05:30
parent 5531bc0140
commit ceab2566ac
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
View File

@ -788,7 +788,9 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
} }
} }
} catch (SQLException e) { } catch (SQLException e) {
throw new DeviceManagementDAOException("Error occurred while listing devices for type '" + type + "'", e); String msg = "Error occurred while listing devices for type '" + type + "'";
log.error(msg, e);
throw new DeviceManagementDAOException(msg, e);
} finally { } finally {
DeviceManagementDAOUtil.cleanupResources(stmt, rs); DeviceManagementDAOUtil.cleanupResources(stmt, rs);
} }
@ -846,15 +848,17 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
} }
} }
} catch (Exception e) { } catch (Exception e) {
log.error("Error encountered while populating allocated active devices for server with index : " + serverIndex + String msg = "Error encountered while populating allocated active devices for server with index : " + serverIndex +
" active-server-count " + activeServerCount + " device-type " + type + " tenant-id " + tenantId); " active-server-count " + activeServerCount + " device-type " + type + " tenant-id " + tenantId;
throw new DeviceManagementDAOException("Error occurred while populating active devices '" + type + "'", e); log.error(msg, e);
throw new DeviceManagementDAOException(msg, e);
} }
} }
} catch (SQLException e) { } catch (SQLException e) {
log.error("Error encountered while retrieving allocated devices for server with index : " + serverIndex + String msg = "Error encountered while retrieving allocated devices for server with index : " + serverIndex +
" active-server-count " + activeServerCount + " device-type " + type + " tenant-id " + tenantId); " active-server-count " + activeServerCount + " device-type " + type + " tenant-id " + tenantId;
throw new DeviceManagementDAOException("Error occurred while listing devices for type '" + type + "'", e); log.error(msg, e);
throw new DeviceManagementDAOException(msg, e);
} }
return devices; return devices;
} }

1
components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/src/main/java/io/entgra/server/bootup/heartbeat/beacon/service/HeartBeatManagementServiceImpl.java
View File

@ -283,6 +283,7 @@ public class HeartBeatManagementServiceImpl implements HeartBeatManagementServic
} }
} catch (HeartBeatDAOException e) { } catch (HeartBeatDAOException e) {
String msg = "Error occurred while recording heart beat."; String msg = "Error occurred while recording heart beat.";
log.error(msg);
throw new HeartBeatManagementException(msg, e); throw new HeartBeatManagementException(msg, e);
} catch (TransactionManagementException e) { } catch (TransactionManagementException e) {
HeartBeatBeaconDAOFactory.rollbackTransaction(); HeartBeatBeaconDAOFactory.rollbackTransaction();

2
components/heartbeat-management/pom.xml
View File

@ -30,7 +30,7 @@
<artifactId>heartbeat-management</artifactId> <artifactId>heartbeat-management</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Entgra - Task Allocation Framework</name> <name>Entgra - Task Allocation Framework</name>
<url>http://wso2.org</url> <url>http://entgra.io</url>
<modules> <modules>
<module>io.entgra.server.bootup.heartbeat.beacon</module> <module>io.entgra.server.bootup.heartbeat.beacon</module>