From 7a421e5ba7a6a9fedcb89e110632f249df17895b Mon Sep 17 00:00:00 2001
From: Benoit <43733395+benoit-sns@users.noreply.github.com>
Date: Mon, 29 Oct 2018 10:42:45 +0000
Subject: [PATCH] SONAR-11400 Quality Profiles updates correctly when it has a
 child profile (#892)

---
 .../org/sonar/server/qualityprofile/RuleActivator.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java
index 5237fa2734c..de3e2af19e1 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RuleActivator.java
@@ -130,13 +130,14 @@ public class RuleActivator {
       persist(change, context, dbSession);
     }
 
+    if (!changes.isEmpty()) {
+      updateProfileDates(dbSession, context);
+    }
+
     if (!stopCascading) {
       changes.addAll(propagateActivationToDescendants(dbSession, activation, context));
     }
 
-    if (!changes.isEmpty()) {
-      updateProfileDates(dbSession, context);
-    }
     return changes;
   }
 
-- 
2.39.5