SONAR-2706 Search for rule name in the English bundle before DB

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 a9d96e1bae50ffda7fa30532c3d7cf8975ce21cb..ec7e9c2b622916f5ca1d4cf7456faa1cc7ea7a15 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
@@ -80,9 +80,9 @@ class Rule < ActiveRecord::Base
     else
       @raw_name ||=
         begin
-          result = read_attribute(:name)
-          # if no name present in the DB, then name is in the English bundle for sure
-          result = Java::OrgSonarServerUi::JRubyFacade.getInstance().getRuleName("en", repository_key, plugin_rule_key) unless result
+          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
           result
         end
     end