Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bill Burke 2015-10-05 13:33:55 -04:00
commit 3b4b5c11e6

View file

@ -1649,6 +1649,7 @@ public class RealmAdapter extends AbstractMongoAdapter<MongoRealmEntity> impleme
RequiredActionProviderEntity auth = new RequiredActionProviderEntity(); RequiredActionProviderEntity auth = new RequiredActionProviderEntity();
auth.setId(KeycloakModelUtils.generateId()); auth.setId(KeycloakModelUtils.generateId());
auth.setAlias(model.getAlias()); auth.setAlias(model.getAlias());
auth.setName(model.getName());
auth.setProviderId(model.getProviderId()); auth.setProviderId(model.getProviderId());
auth.setConfig(model.getConfig()); auth.setConfig(model.getConfig());
auth.setEnabled(model.isEnabled()); auth.setEnabled(model.isEnabled());
@ -1679,6 +1680,7 @@ public class RealmAdapter extends AbstractMongoAdapter<MongoRealmEntity> impleme
model.setId(entity.getId()); model.setId(entity.getId());
model.setProviderId(entity.getProviderId()); model.setProviderId(entity.getProviderId());
model.setAlias(entity.getAlias()); model.setAlias(entity.getAlias());
model.setName(entity.getName());
model.setEnabled(entity.isEnabled()); model.setEnabled(entity.isEnabled());
model.setDefaultAction(entity.isDefaultAction()); model.setDefaultAction(entity.isDefaultAction());
Map<String, String> config = new HashMap<>(); Map<String, String> config = new HashMap<>();