SONAR-5417 Module settings should contains all parent settings

1 files changed, 6 insertions, 1 deletions

diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectReferentials.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectReferentials.java
index a386a0eeac7..570fb3630e5 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectReferentials.java
+++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ProjectReferentials.java
@@ -43,7 +43,12 @@ public class ProjectReferentials {
   }
 
   public ProjectReferentials addSettings(String projectKey, Map<String, String> settings) {
-    settingsByModule.put(projectKey, settings);
+    Map<String, String> existingSettings = settingsByModule.get(projectKey);
+    if (existingSettings == null) {
+      existingSettings = new HashMap<String, String>();
+    }
+    existingSettings.putAll(settings);
+    settingsByModule.put(projectKey, existingSettings);
     return this;
   }