1 files changed, 7 insertions, 2 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/qualitygate/QualityGateProvider.java b/sonar-batch/src/main/java/org/sonar/batch/qualitygate/QualityGateProvider.java
index 3cfba31d384..d628cd324b7 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/qualitygate/QualityGateProvider.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/qualitygate/QualityGateProvider.java
@@ -40,8 +40,13 @@ public class QualityGateProvider extends ProviderAdapter {
 
   private static final String PROPERTY_QUALITY_GATE = "sonar.qualitygate";
 
+  private QualityGate instance;
+
   public QualityGate provide(Settings settings, ServerClient client, MetricFinder metricFinder) {
-    return init(settings, client, metricFinder, LOG);
+    if (instance == null) {
+      instance = init(settings, client, metricFinder, LOG);
+    }
+    return instance;
   }
 
   @VisibleForTesting
@@ -52,8 +57,8 @@ public class QualityGateProvider extends ProviderAdapter {
       logger.info("No quality gate is configured.");
     } else {
       result = load(qualityGateSetting, client.wsClient().qualityGateClient(), metricFinder);
+      logger.info("Loaded quality gate '{}'", result.name());
     }
-    logger.info("Loaded quality gate '{}'", result.name());
     return result;
   }