mariusz.pacek/keycloak
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3359 from stianst/KEYCLOAK-3737

Browse Source 
KEYCLOAK-3737
This commit is contained in:
Stian Thorgersen authored and GitHub committed 2016-10-19 12:06:12 +02:00
2 parents f2f508ac2e 24715eabec
commit 53fcc1bec2
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
server-spi/src/main/java/org/keycloak/migration/migrators/MigrationUtils.java
+2 -2
View File
@@ -33,7 +33,7 @@ public class MigrationUtils {
public static void addAdminRole(RealmModel realm, String roleName) {
ClientModel client = realm.getMasterAdminClient();
if (client.getRole(roleName) == null) {
if (client != null && client.getRole(roleName) == null) {
RoleModel role = client.addRole(roleName);
role.setDescription("${role_" + roleName + "}");
role.setScopeParamRequired(false);
@@ -43,7 +43,7 @@ public class MigrationUtils {
if (!realm.getName().equals(Config.getAdminRealm())) {
client = realm.getClientByClientId(Constants.REALM_MANAGEMENT_CLIENT_ID);
if (client.getRole(roleName) == null) {
if (client != null && client.getRole(roleName) == null) {
RoleModel role = client.addRole(roleName);
role.setDescription("${role_" + roleName + "}");
role.setScopeParamRequired(false);