From abb73ba0ababb837d68b48322488a18ef740c58d Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 12 Mar 2014 18:20:17 +0100 Subject: [PATCH] SONAR-5056 Close connection after deleting requirements --- ...CopyRequirementsFromCharacteristicsToRules.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java b/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java index 82120bc1cb1..c351f9ff84c 100644 --- a/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java +++ b/sonar-server/src/main/java/org/sonar/server/startup/CopyRequirementsFromCharacteristicsToRules.java @@ -25,6 +25,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; +import org.apache.commons.dbutils.DbUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -214,13 +215,18 @@ public class CopyRequirementsFromCharacteristicsToRules { } - private void removeRequirementsDataFromCharacteristics(){ + private void removeRequirementsDataFromCharacteristics() { + Connection connection = null; + Statement stmt = null; try { - Connection connection = db.getDataSource().getConnection(); - Statement stmt = connection.createStatement(); + connection = db.getDataSource().getConnection(); + stmt = connection.createStatement(); stmt.executeUpdate("DELETE FROM characteristics WHERE rule_id IS NOT NULL"); } catch (SQLException e) { - throw new IllegalStateException("Fail to remove requirements data from characteristics"); + throw new IllegalStateException("Fail to remove requirements data from characteristics", e); + } finally { + DbUtils.closeQuietly(stmt); + DbUtils.closeQuietly(connection); } } -- 2.39.5