diff --git a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
index f3f04952666..f9c2433754b 100644
--- a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
+++ b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
@@ -144,21 +144,13 @@ public class ConfigurationDaoImpl extends GenericDaoBase<ConfigurationVO, String
     @Deprecated
     public boolean update(String name, String value) {
         TransactionLegacy txn = TransactionLegacy.currentTxn();
-        PreparedStatement stmt = null;
-        try {
-            stmt = txn.prepareStatement(UPDATE_CONFIGURATION_SQL);
+        try (PreparedStatement stmt = txn.prepareStatement(UPDATE_CONFIGURATION_SQL);){
             stmt.setString(1, value);
             stmt.setString(2, name);
             stmt.executeUpdate();
             return true;
         } catch (Exception e) {
             s_logger.warn("Unable to update Configuration Value", e);
-        } finally {
-            try {
-                if (stmt != null)
-                    stmt.close();
-            } catch (SQLException e) {
-            }
         }
         return false;
     }
@@ -166,22 +158,14 @@ public class ConfigurationDaoImpl extends GenericDaoBase<ConfigurationVO, String
     @Override
     public boolean update(String name, String category, String value) {
         TransactionLegacy txn = TransactionLegacy.currentTxn();
-        PreparedStatement stmt = null;
-        try {
-            value = ("Hidden".equals(category) || "Secure".equals(category)) ? DBEncryptionUtil.encrypt(value) : value;
-            stmt = txn.prepareStatement(UPDATE_CONFIGURATION_SQL);
+        value = ("Hidden".equals(category) || "Secure".equals(category)) ? DBEncryptionUtil.encrypt(value) : value;
+        try (PreparedStatement stmt = txn.prepareStatement(UPDATE_CONFIGURATION_SQL);) {
             stmt.setString(1, value);
             stmt.setString(2, name);
             stmt.executeUpdate();
             return true;
         } catch (Exception e) {
             s_logger.warn("Unable to update Configuration Value", e);
-        } finally {
-            try {
-                if (stmt != null)
-                    stmt.close();
-            } catch (SQLException e) {
-            }
         }
         return false;
     }