Fix wso2/product-is#6124: 'Use user store domain in roles' property cannot be disable from the UI
@@ -2590,16 +2590,16 @@ public class ApplicationDAOImpl extends AbstractApplicationDAOImpl {
.getString(5));
if (CollectionUtils.isNotEmpty(propertyList)) {
for (ServiceProviderProperty serviceProviderProperty : propertyList) {
- if (USE_DOMAIN_IN_ROLES.equals(serviceProviderProperty.getName()) && "TRUE".
- equalsIgnoreCase(serviceProviderProperty.getValue())) {
+ if (USE_DOMAIN_IN_ROLES.equals(serviceProviderProperty.getName())) {
+ if ("TRUE".equalsIgnoreCase(serviceProviderProperty.getValue())) {
localAndOutboundConfiguration.setUseUserstoreDomainInRoles(true);
- } else if (USE_DOMAIN_IN_ROLES.equals(serviceProviderProperty.getName()) && !"TRUE".
- equalsIgnoreCase(serviceProviderProperty.getValue())) {
+ } else if (!"TRUE".equalsIgnoreCase(serviceProviderProperty.getValue())) {
localAndOutboundConfiguration.setUseUserstoreDomainInRoles(false);
} else {
localAndOutboundConfiguration.setUseUserstoreDomainInRoles(true);
}
}
+ }
} else {
localAndOutboundConfiguration.setUseUserstoreDomainInRoles(true);
}
