From b7bc1c04ed0ad519c51123c3e24d5198e6a0342b Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Wed, 30 Jul 2014 12:13:21 +0200
Subject: SONAR-5417 Module settings should contains all parent settings

---
 .../java/org/sonar/batch/protocol/input/ProjectReferentials.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'sonar-batch-protocol')

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;
   }
 
-- 
cgit v1.2.3