Martin Peřina has uploaded a new change for review. Change subject: aaa: Add LdapServers into domain separated config values ......................................................................
aaa: Add LdapServers into domain separated config values 1) Adds LdapServers into domain separated config values (EngineExtensionsManager.multipleValuesKeys) 2) LdapServers value may be empty, which is valid in case that --ldap-servers in engine-manage-domains was not specified, so EngineExtensionsManager.getValue was adapted to support empty values Change-Id: I9ff932f1a8dec1ba2f9c834e4e62601202ee97ec Bug-Url: https://bugzilla.redhat.com/1111071 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java 1 file changed, 15 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/28969/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java index 61ff49b..07507f9 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java @@ -35,7 +35,8 @@ "AdUserId", "AdUserPassword", "LDAPProviderTypes", - "LDAPSecurityAuthentication" + "LDAPSecurityAuthentication", + "LdapServers" )); public static EngineExtensionsManager getInstance() { @@ -219,21 +220,23 @@ } private String getValue(String domain, String val) { - String[] domainPairs = val.split(","); - String result = null; - for (String pair : domainPairs) { - String[] nameValue = pair.split(":"); - if (nameValue.length != 2) { - throw new RuntimeException( + String result = ""; + if (val != null && val.length() > 0) { + String[] domainPairs = val.split(","); + for (String pair : domainPairs) { + String[] nameValue = pair.split(":"); + if (nameValue.length != 2) { + throw new RuntimeException( String.format( "Domain information should be in format of DomainName:Value. The string %1$s does not match this format", pair ) - ); - } - if (nameValue[0].equals(domain)) { - result = nameValue[1]; - break; + ); + } + if (nameValue[0].equals(domain)) { + result = nameValue[1]; + break; + } } } return result; -- To view, visit http://gerrit.ovirt.org/28969 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ff932f1a8dec1ba2f9c834e4e62601202ee97ec Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
