Revert Props setDefault

diff --git a/server/process/sonar-process/src/main/java/org/sonar/process/Props.java b/server/process/sonar-process/src/main/java/org/sonar/process/Props.java
index 45a630c365cd463f5cc42aa4cfede4010eda7568..d6e2795a597120a6280ed587a1bab329391c36fe 100644 (file)
--- a/server/process/sonar-process/src/main/java/org/sonar/process/Props.java
+++ b/server/process/sonar-process/src/main/java/org/sonar/process/Props.java
@@ -19,6 +19,8 @@
  */
 package org.sonar.process;
 
+import org.apache.commons.lang.StringUtils;
+
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 import java.io.File;
@@ -95,4 +97,11 @@ public class Props {
     }
     return this;
   }
+
+  public void setDefault(String key, String value) {
+    String s = properties.getProperty(key);
+    if (StringUtils.isBlank(s)) {
+      properties.setProperty(key, value);
+    }
+  }
 }

diff --git a/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java b/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
index 7a3bca0d100d416c6bad6f0b7c254bc2c8d2b69e..e6d737487ac1da5db51229471187ea19b0323a40 100644 (file)
--- a/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
+++ b/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
@@ -49,7 +49,7 @@ class DefaultSettings {
 
     // init string properties
     for (Map.Entry<String, String> entry : defaults().entrySet()) {
-      props.set(entry.getKey(), entry.getValue());
+      props.setDefault(entry.getKey(), entry.getValue());
     }
 
     // init ports