keycloak-memoizeit

KEYCLOAK-2539 Migration fails if DisplayNameHtml is null …

2/24/2016 2:59:02 AM

for master realm

Stian Thorgersen

Commit: ab96114

Tree: 776fb80

Parents: c45e40d

Changes

server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java 2(+1 -1)

Details

server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java 2(+1 -1)

diff --git a/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java
index 81414c1..f8c709b 100644
--- a/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java
+++ b/server-spi/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_0.java
@@ -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>");
         }
     }