Creation of notifications on quality gate must be executed after computation of quality gate measure

2 files changed, 12 insertions, 2 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java
index bddb6c28a09..043b0ddf8be 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationSteps.java
@@ -54,10 +54,17 @@ public class ComputationSteps {
 
       // data computation
       CustomMeasuresCopyStep.class,
-      QualityProfileEventsStep.class,
-      QualityGateEventsStep.class,
+            
+      // Must be executed after computation of all measures
       FillMeasuresWithVariationsStep.class,
+
+      // Must be executed after computation of differential measures
       QualityGateMeasuresStep.class,
+      
+      QualityProfileEventsStep.class,
+      
+      // Must be executed after computation of quality gate measure
+      QualityGateEventsStep.class,
 
       // Persist data
       PersistComponentsStep.class,
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateEventsStep.java
index 499b6439c85..df1b03047a5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateEventsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/QualityGateEventsStep.java
@@ -37,6 +37,9 @@ import org.sonar.server.computation.metric.Metric;
 import org.sonar.server.computation.metric.MetricRepository;
 import org.sonar.server.notification.NotificationManager;
 
+/**
+ * This step must be executed after computation of quality gate measure {@link QualityGateMeasuresStep}
+ */
 public class QualityGateEventsStep implements ComputationStep {
   private static final Logger LOGGER = Loggers.get(QualityGateEventsStep.class);