SONAR-4908 enable extension point RuleDefinitions

2 files changed, 3 insertions, 8 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/rule/RuleDao.java b/sonar-core/src/main/java/org/sonar/core/rule/RuleDao.java
index 940dcf0c55b..ee0571450d3 100644
--- a/sonar-core/src/main/java/org/sonar/core/rule/RuleDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/rule/RuleDao.java
@@ -46,13 +46,8 @@ public class RuleDao implements BatchComponent, ServerComponent {
     }
   }
 
-  public List<RuleDto> selectNonManual() {
-    SqlSession session = mybatis.openSession();
-    try {
-      return getMapper(session).selectNonManual();
-    } finally {
-      MyBatis.closeQuietly(session);
-    }
+  public List<RuleDto> selectNonManual(SqlSession session) {
+    return getMapper(session).selectNonManual();
   }
 
   public RuleDto selectById(Integer id, SqlSession session) {
diff --git a/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java b/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
index 43e0b9ce660..997f4a91f3f 100644
--- a/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
@@ -83,7 +83,7 @@ public class RuleDaoTest extends AbstractDaoTestCase {
   @Test
   public void testSelectNonManual() throws Exception {
     setupData("selectNonManual");
-    List<RuleDto> ruleDtos = dao.selectNonManual();
+    List<RuleDto> ruleDtos = dao.selectNonManual(getMyBatis().openSession());
 
     assertThat(ruleDtos.size()).isEqualTo(1);
     RuleDto ruleDto = ruleDtos.get(0);