2 files changed, 15 insertions, 4 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterRules.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterRules.java
index 8f5e2e64d99..b325da87a21 100644
--- a/sonar-server/src/main/java/org/sonar/server/startup/RegisterRules.java
+++ b/sonar-server/src/main/java/org/sonar/server/startup/RegisterRules.java
@@ -166,7 +166,9 @@ public final class RegisterRules {
         ruleI18nManager.getParamDescription(rule.getRepositoryKey(), rule.getKey(), param.getKey()),
         param.getDescription()
       );
-      param.setDescription(desc);
+      if (!Strings.isNullOrEmpty(desc)) {
+        param.setDescription(desc);
+      }
     }
   }
 
diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterRulesTest.java b/sonar-server/src/test/java/org/sonar/server/startup/RegisterRulesTest.java
index d51c8cd5cd8..424c4850081 100644
--- a/sonar-server/src/test/java/org/sonar/server/startup/RegisterRulesTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/startup/RegisterRulesTest.java
@@ -37,9 +37,7 @@ import static org.fest.assertions.Assertions.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 public class RegisterRulesTest extends AbstractDbUnitTestCase {
 
@@ -88,6 +86,17 @@ public class RegisterRulesTest extends AbstractDbUnitTestCase {
   }
 
   @Test
+  public void not_save_rule_param_description_from_bundle_on_empty_value() {
+    setupData("empty");
+    when(ruleI18nManager.getParamDescription("fake", "rule2", "param")).thenReturn("");
+    task.start();
+
+    Rule rule = getSession().getSingleResult(Rule.class, "id", 2);
+    assertThat(rule.getParams()).hasSize(1);
+    assertThat(rule.getParams().get(0).getDescription()).isNull();
+  }
+
+  @Test
   public void should_update_template_rule() {
     setupData("should_update_template_rule_language");
     task.start();