aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalServerSettingsProvider.java
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2018-12-13 12:25:44 +0100
committersonartech <sonartech@sonarsource.com>2019-01-16 09:43:10 +0100
commitf4261e1605ab8f8d346c152ccc7e913ec4e48daf (patch)
treed24ff74509e8c424414937f236306fa0077c82d7 /sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalServerSettingsProvider.java
parent0e834f9196d911f66a487f36fd5fde41164b8b21 (diff)
downloadsonarqube-f4261e1605ab8f8d346c152ccc7e913ec4e48daf.tar.gz
sonarqube-f4261e1605ab8f8d346c152ccc7e913ec4e48daf.zip
SONAR-11480 SONAR-11508 Consider server side settings when evaluating module level exclusions
Diffstat (limited to 'sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalServerSettingsProvider.java')
-rw-r--r--sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalServerSettingsProvider.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalServerSettingsProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalServerSettingsProvider.java
index 53cb91e5d9b..9f2ff35d9d0 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalServerSettingsProvider.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalServerSettingsProvider.java
@@ -35,7 +35,7 @@ public class GlobalServerSettingsProvider extends ProviderAdapter {
public GlobalServerSettings provide(SettingsLoader loader) {
if (singleton == null) {
- Map<String, String> serverSideSettings = loader.load(null);
+ Map<String, String> serverSideSettings = loader.loadGlobalSettings();
singleton = new GlobalServerSettings(serverSideSettings);
Optional.ofNullable(serverSideSettings.get(CoreProperties.SERVER_ID)).ifPresent(v -> LOG.info("Server id: {}", v));
}