Fix creation of administrator

2 files changed, 10 insertions, 10 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
index d2f4a2bb449..1c3f88c779b 100644
--- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
+++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
@@ -520,10 +520,14 @@ public final class JRubyFacade {
 
   // USERS
   public void onNewUser(Map<String, String> fields) {
-    getContainer().getComponentByType(NewUserNotifier.class).onNewUser(NewUserHandler.Context.builder()
-      .setLogin(fields.get("login"))
-      .setName(fields.get("name"))
-      .setEmail(fields.get("email"))
-      .build());
+    NewUserNotifier notifier = getContainer().getComponentByType(NewUserNotifier.class);
+    // notifier is null when creating the administrator in the migration script 011.
+    if (notifier != null) {
+      notifier.onNewUser(NewUserHandler.Context.builder()
+        .setLogin(fields.get("login"))
+        .setName(fields.get("name"))
+        .setEmail(fields.get("email"))
+        .build());
+    }
   }
 }
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 152900bede9..c70d33985a4 100644
--- 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,10 +207,6 @@ class User < ActiveRecord::Base
   private
 
   def on_create
-    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
+    Java::OrgSonarServerUi::JRubyFacade.getInstance().onNewUser({'login' => self.login, 'name' => self.name, 'email' => self.email})
   end
 end