diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-10-03 15:08:31 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-10-03 15:14:24 +0200 |
| commit | 3406907abc194c2a665539f49cea1a16f877e667 (patch) | |
| tree | 4df29ff9cd37560573d229d3c728505857502408 | |
| parent | ed330af0f4cf10cbc8dde0dc18fa9a3a02c87fb6 (diff) | |
| download | sonarqube-3406907abc194c2a665539f49cea1a16f877e667.tar.gz sonarqube-3406907abc194c2a665539f49cea1a16f877e667.zip | |
Fix loading of settings tabs
| -rw-r--r-- | server/sonar-search/src/main/java/org/sonar/search/SearchServer.java | 4 | ||||
| -rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/app/controllers/application_controller.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java index d63abe3b2b5..353331ade15 100644 --- a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java +++ b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java @@ -145,7 +145,7 @@ public class SearchServer implements Monitored { @Override public boolean isReady() { - return node.client().admin().cluster().prepareHealth() + return node != null && node.client().admin().cluster().prepareHealth() .setWaitForYellowStatus() .setTimeout(TimeValue.timeValueSeconds(3L)) .get() @@ -248,7 +248,7 @@ public class SearchServer implements Monitored { } @Override - public synchronized void stop() { + public void stop() { if (node != null && !node.isClosed()) { node.close(); } diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/application_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/application_controller.rb index 9ced766bb35..7e07115ce41 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/application_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/application_controller.rb @@ -324,10 +324,10 @@ class ApplicationController < ActionController::Base if params[:category].nil? # Select the 'general' category by default. If 'general' category is not found, then return the first one. - default_category = @categories.empty? ? nil : (@categories.find {|c| c && c.key == 'general'} || @categories[0]) + default_category = @categories.empty? ? nil : (@categories.find {|c| c && c.key.downcase == 'general'} || @categories[0]) @category = default_category else - @category = @categories.find {|c| c && c.key == params[:category]} + @category = @categories.find {|c| c && c.key.casecmp(params[:category])==0} not_found('category') if @category.nil? end @@ -341,7 +341,7 @@ class ApplicationController < ActionController::Base ((@subcategories_per_categories[@category].include? @category) ? @category : @subcategories_per_categories[@category][0]) @subcategory = default_subcategory else - @subcategory = @subcategories_per_categories[@category].find {|s| s && s.key == params[:subcategory]} + @subcategory = @subcategories_per_categories[@category].find {|s| s && s.key.casecmp(params[:subcategory])==0} not_found('subcategory') if @subcategory.nil? end |