libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Merge pull request #1831 from abstractj/KEYCLOAK-2100

Browse source 
KEYCLOAK-2100: 500 Internal Server Error with Update the events provider via Admin REST API
This commit is contained in:
Stian Thorgersen 2015-11-17 20:35:48 +01:00
commit 67fca8f1f3
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/src/main/java/org/keycloak/services/managers/RealmManager.java
View file

@ -50,6 +50,7 @@ import org.keycloak.timer.TimerProvider;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import static java.lang.Boolean.TRUE;
import org.keycloak.models.ProtocolMapperModel;
import org.keycloak.protocol.ProtocolMapperUtils;
@ -221,9 +222,12 @@ public class RealmManager implements RealmImporter {
if(rep.getEnabledEventTypes() != null) {
realm.setEnabledEventTypes(new HashSet<>(rep.getEnabledEventTypes()));
}
realm.setAdminEventsEnabled(rep.isAdminEventsEnabled());
realm.setAdminEventsDetailsEnabled(rep.isAdminEventsDetailsEnabled());
if(rep.isAdminEventsEnabled() != null) {
realm.setAdminEventsEnabled(rep.isAdminEventsEnabled());
}
if(rep.isAdminEventsDetailsEnabled() != null){
realm.setAdminEventsDetailsEnabled(rep.isAdminEventsDetailsEnabled());
}
}
private void setupMasterAdminManagement(RealmModel realm) {