SONAR-3646 do not fail on non-h2 databases when creating administrator

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb
index c70d33985a4cc50f3945d9f64b08ff4d6c928bd9..152900bede970d591ca6af903fcb21d9c6e47154 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/user.rb
@@ -207,6 +207,10 @@ class User < ActiveRecord::Base
   private
 
   def on_create
-    Java::OrgSonarServerUi::JRubyFacade.getInstance().onNewUser({'login' => self.login, 'name' => self.name, 'email' => self.email})
+    facade = Java::OrgSonarServerUi::JRubyFacade.getInstance()
+    if facade
+      # the facade is null when creating the administration in migration 011
+      facade.onNewUser({'login' => self.login, 'name' => self.name, 'email' => self.email})
+    end
   end
 end