etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CID-1147052 Use try-with-resources to fix the leak

This commit is contained in:
Hugo Trippaers 2014-06-03 17:20:16 +02:00
parent d21a15beb2
commit 703febc64b
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
usage/src/com/cloud/usage/UsageSanityChecker.java
View File

@ -64,30 +64,22 @@ public class UsageSanityChecker {
}
protected boolean checkItemCountByPstmt(CheckCase checkCase) throws SQLException {
List<PreparedStatement> pstmt2Close = new ArrayList<PreparedStatement>();
boolean checkOk = true;
/*
* Check for item usage records which are created after it is removed
*/
PreparedStatement pstmt;
try {
pstmt = conn.prepareStatement(checkCase.sqlTemplate);
try (PreparedStatement pstmt = conn.prepareStatement(checkCase.sqlTemplate)) {
if(checkCase.checkId) {
pstmt.setInt(1, lastId);
pstmt.setInt(2, maxId);
}
pstmt2Close.add(pstmt);
ResultSet rs = pstmt.executeQuery();
if (rs.next() && (rs.getInt(1) > 0)) {
errors.append(String.format("Error: Found %s %s\n", rs.getInt(1), checkCase.itemName));
checkOk = false;
}
} catch (SQLException e) {
throw e;
} finally {
TransactionLegacy.closePstmts(pstmt2Close);
}
return checkOk;
}
@ -190,12 +182,13 @@ public class UsageSanityChecker {
}
protected void readMaxId() throws SQLException {
PreparedStatement pstmt = conn.prepareStatement("select max(id) from cloud_usage.cloud_usage");
ResultSet rs = pstmt.executeQuery();
maxId = -1;
if (rs.next() && (rs.getInt(1) > 0)) {
maxId = rs.getInt(1);
lastCheckId += " and cu.id <= ?";
try (PreparedStatement pstmt = conn.prepareStatement("select max(id) from cloud_usage.cloud_usage")) {
ResultSet rs = pstmt.executeQuery();
maxId = -1;
if (rs.next() && (rs.getInt(1) > 0)) {
maxId = rs.getInt(1);
lastCheckId += " and cu.id <= ?";
}
}
}