SONAR-4583 SONAR-4559 When rule name or description is null, display an empty String...

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb
index 489955ea0a9c0bbcfa6f562483210788ed6c767f..1b00e9010ffa7ee197246585ff40d3be54ba351e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb
@@ -107,6 +107,9 @@ class Rule < ActiveRecord::Base
         begin
           result = Java::OrgSonarServerUi::JRubyFacade.getInstance().getRuleName(I18n.locale, repository_key, plugin_rule_key)
           result = read_attribute(:name) unless result
+          # SONAR-4583
+          # name should return an empty string instead of nil
+          result = '' unless result
           result
         end
     else
@@ -115,6 +118,9 @@ class Rule < ActiveRecord::Base
           result = Java::OrgSonarServerUi::JRubyFacade.getInstance().getRuleName("en", repository_key, plugin_rule_key)
           # if no name present in the bundle, try to find it in the DB
           result = read_attribute(:name) unless result
+          # SONAR-4583
+          # name should return an empty string instead of nil
+          result = '' unless result
           result
         end
     end
@@ -129,6 +135,9 @@ class Rule < ActiveRecord::Base
       begin
         result = Java::OrgSonarServerUi::JRubyFacade.getInstance().getRuleDescription(I18n.locale, repository_key, plugin_rule_key)
         result = read_attribute(:description) unless result
+        # SONAR-4583
+        # description should return an empty string instead of nil
+        result = '' unless result
         result
       end
   end