SONAR-3145 During migration, access to Sonar is not allowed

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb
index ba6da3894f424decc3baab97492cde7b650c6094..3b382a1b3245cb6aa7cdeba724111efba40634ab 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb
@@ -80,7 +80,7 @@ class ApplicationController < ActionController::Base
   protected
 
   def check_database_version
-    unless DatabaseVersion.uptodate?
+    unless DatabaseMigrationManager.instance.is_sonar_access_allowed?
       redirect_to :controller => 'maintenance', :action => 'index'
     end
   end

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/database_migration_manager.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/database_migration_manager.rb
index 4f3072cac33aa7a54f2abb56cb18720f876ff127..a2b59ea9cfebb0f679963e536fe8f1940b31f5b3 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/database_migration_manager.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/database_migration_manager.rb
@@ -80,6 +80,10 @@ class DatabaseMigrationManager
     @status==MIGRATION_FAILED
   end
   
+  def is_sonar_access_allowed?
+    @status==NO_MIGRATION || @status==MIGRATION_SUCCEEDED
+  end
+  
   def migration_start_time
     @start_time
   end