Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bill Burke 2016-02-24 17:21:25 -05:00
commit 17ea3fca0b

View file

@ -39,7 +39,7 @@ public class MigrateTo1_9_0 {
public void migrate(KeycloakSession session) {
RealmModel realm = session.realms().getRealmByName(Config.getAdminRealm());
if (realm != null && realm.getDisplayNameHtml().equals("<strong>Keycloak</strong>")) {
if (realm != null && realm.getDisplayNameHtml() != null && realm.getDisplayNameHtml().equals("<strong>Keycloak</strong>")) {
realm.setDisplayNameHtml("<div class=\"kc-logo-text\"><span>Keycloak</span></div>");
}
}