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

spark404 · spark404 · commit 703febc64bf7 · 2014-06-03T17:20:16.000+02:00
diff --git a/usage/src/com/cloud/usage/UsageSanityChecker.java b/usage/src/com/cloud/usage/UsageSanityChecker.java
@@ -64,30 +64,22 @@ protected boolean checkItemCountByPstmt() throws SQLException {
     }
 
     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 @@ protected void readLastCheckId(){
     }
 
     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 <= ?";
+            }
         }
     }
 
