Fix some quality flaws

1 files changed, 9 insertions, 1 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseMigrator.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseMigrator.java
index 889bcd2014f..3e6e5623862 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseMigrator.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseMigrator.java
@@ -51,7 +51,15 @@ public class DatabaseMigrator implements ServerComponent {
       try {
         DdlUtils.createSchema(connection, database.getDialect().getId());
       } finally {
-        session.close();
+        try {
+          session.close();
+
+          // The connection is probably already closed by session.close()
+          // but it's not documented in mybatis javadoc.
+          connection.close();
+        } catch (Exception e) {
+          // ignore
+        }
       }
       return true;
     }