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

Merge pull request #1910 from mposolda/master

Browse source 
KEYCLOAK-2149 Fix possible NPE during migration
This commit is contained in:
Marek Posolda 2015-12-01 12:35:27 +01:00
commit 9d5356a001
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
model/api/src/main/java/org/keycloak/models/utils/DefaultAuthenticationFlows.java
View file

@ -429,6 +429,10 @@ public class DefaultAuthenticationFlows {
if (migrate) { if (migrate) {
// Try to read OTP requirement from browser flow // Try to read OTP requirement from browser flow
AuthenticationFlowModel browserFlow = realm.getBrowserFlow(); AuthenticationFlowModel browserFlow = realm.getBrowserFlow();
if (browserFlow == null) {
browserFlow = realm.getFlowByAlias(DefaultAuthenticationFlows.BROWSER_FLOW);
}
List<AuthenticationExecutionModel> browserExecutions = new LinkedList<>(); List<AuthenticationExecutionModel> browserExecutions = new LinkedList<>();
KeycloakModelUtils.deepFindAuthenticationExecutions(realm, browserFlow, browserExecutions); KeycloakModelUtils.deepFindAuthenticationExecutions(realm, browserFlow, browserExecutions);
for (AuthenticationExecutionModel browserExecution : browserExecutions) { for (AuthenticationExecutionModel browserExecution : browserExecutions) {