SONAR-7100 Disable WS cache by default in issues mode

1 files changed, 5 insertions, 4 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/analysis/AnalysisWSLoaderProvider.java b/sonar-batch/src/main/java/org/sonar/batch/analysis/AnalysisWSLoaderProvider.java
index 7ca47ae787a..fc3482a2006 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/analysis/AnalysisWSLoaderProvider.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/analysis/AnalysisWSLoaderProvider.java
@@ -27,19 +27,20 @@ import org.sonar.batch.cache.WSLoader.LoadStrategy;
 import org.sonar.home.cache.PersistentCache;
 
 public class AnalysisWSLoaderProvider extends ProviderAdapter {
+  static final String SONAR_USE_WS_CACHE = "sonar.useWsCache";
   private WSLoader wsLoader;
 
-  public WSLoader provide(AnalysisMode mode, PersistentCache cache, BatchWsClient client) {
+  public WSLoader provide(AnalysisMode mode, PersistentCache cache, BatchWsClient client, AnalysisProperties props) {
     if (wsLoader == null) {
       // recreate cache directory if needed for this analysis
       cache.reconfigure();
-      wsLoader = new WSLoader(getStrategy(mode), cache, client);
+      wsLoader = new WSLoader(getStrategy(mode, props), cache, client);
     }
     return wsLoader;
   }
 
-  private static LoadStrategy getStrategy(AnalysisMode mode) {
-    if (mode.isIssues()) {
+  private static LoadStrategy getStrategy(AnalysisMode mode, AnalysisProperties props) {
+    if (mode.isIssues() && "true".equals(props.property(SONAR_USE_WS_CACHE))) {
       return LoadStrategy.CACHE_ONLY;
     }