SONAR-4923 Fix parent update where active rules from previous parent were not disabled

2 files changed, 4 insertions, 0 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java
index 96d55cf235c..cec9fb5ca36 100644
--- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java
+++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java
@@ -199,6 +199,7 @@ public class QProfileOperations implements ServerComponent {
       QualityProfileDto profileDto = findNotNull(profileId, session);
       checkNotAlreadyExists(copyProfileName, profileDto.getLanguage(), session);
       int copyProfileId = profilesManager.copyProfile(profileId, copyProfileName);
+      session.commit();
       ruleRegistry.bulkIndexProfile(copyProfileId, session);
     } finally {
       MyBatis.closeQuietly(session);
diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java
index 52c10699b01..3f390d21753 100644
--- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java
@@ -392,6 +392,7 @@ public class QProfileOperationsTest {
     operations.copyProfile(1, "Copy Default", authorizedUserSession);
 
     verify(profilesManager).copyProfile(1, "Copy Default");
+    verify(session).commit();
     verify(ruleRegistry).bulkIndexProfile(2, session);
   }
 
@@ -408,6 +409,7 @@ public class QProfileOperationsTest {
     }
 
     verifyZeroInteractions(profilesManager);
+    verify(session, never()).commit();
     verifyZeroInteractions(ruleRegistry);
   }
 
@@ -425,6 +427,7 @@ public class QProfileOperationsTest {
     }
 
     verifyZeroInteractions(profilesManager);
+    verify(session, never()).commit();
     verifyZeroInteractions(ruleRegistry);
   }