SONAR-4859 Fix regression on copy of rule template (no i18n there)

diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java
index 66e6b3b6db47753e4ece88f4e4349d084e24dd7a..fc9a5c7f7482f596176e40c26a8ff42b5e5579e6 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistry.java
@@ -23,6 +23,7 @@ package org.sonar.server.rule;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
+import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.common.collect.Maps;
 import org.elasticsearch.common.io.BytesStream;
@@ -169,8 +170,14 @@ public class RuleRegistry {
         .field("id", rule.getId())
         .field("key", rule.getRuleKey())
         .field("language", rule.getLanguage())
-        .field("name", ruleI18nManager.getName(rule.getRepositoryKey(), rule.getRuleKey(), locale))
-        .field("description", ruleI18nManager.getDescription(rule.getRepositoryKey(), rule.getRuleKey(), locale))
+        .field("name",
+          StringUtils.defaultIfEmpty(
+            ruleI18nManager.getName(rule.getRepositoryKey(), rule.getRuleKey(), locale),
+            rule.getName()))
+        .field("description",
+          StringUtils.defaultString(
+            ruleI18nManager.getDescription(rule.getRepositoryKey(), rule.getRuleKey(), locale),
+            rule.getDescription()))
         .field("parentKey", rule.getParentId() == null ? null : rule.getParentId())
         .field("repositoryKey", rule.getRepositoryKey())
         .field("severity", rule.getPriority())