SONAR-5007 - Implicit Commit when deleting nestedDto (Simplifies ES)

2 files changed, 5 insertions, 2 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java b/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
index 155214d5cc0..a1e7ea9c0cf 100644
--- a/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
+++ b/sonar-server/src/main/java/org/sonar/server/db/BaseDao.java
@@ -262,6 +262,7 @@ public abstract class BaseDao<M, E extends Dto<K>, K extends Serializable> imple
     if (hasIndex()) {
       session.enqueue(new EmbeddedIndexAction<K>(
         this.getIndexType(), IndexAction.Method.DELETE, key, nestedItem));
+      session.commit();
     }
   }
 
diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
index 2cd88d6d386..1ef6b268824 100644
--- a/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java
@@ -21,7 +21,10 @@
 package org.sonar.server.rule;
 
 import com.google.common.collect.ImmutableMap;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.rule.Severity;
@@ -250,7 +253,6 @@ public class RegisterRulesMediumTest {
   }
 
   @Test
-  @Ignore("Should be fixed by @steph")
   public void not_update_custom_rule_params_from_template() throws Exception {
     RuleIndex index = tester.get(RuleIndex.class);
     Rule templateRule = index.getByKey(RuleKey.of("xoo", "template1"));