Author: thomas.heute(a)jboss.com Date: 2009-12-16 05:41:25 -0500 (Wed, 16 Dec 2009) New Revision: 13886 Modified: modules/identity/tags/JBP_IDENTITY_1_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java Log: fix to not require new options set in configuration Modified: modules/identity/tags/JBP_IDENTITY_1_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java =================================================================== --- modules/identity/tags/JBP_IDENTITY_1_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java 2009-12-16 09:07:48 UTC (rev 13885) +++ modules/identity/tags/JBP_IDENTITY_1_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java 2009-12-16 10:41:25 UTC (rev 13886) @@ -136,7 +136,7 @@ } attrs.put(attr); - if(getUpdatePasswordAttributeValues().size() > 0) + if(getUpdatePasswordAttributeValues() != null && getUpdatePasswordAttributeValues().size() > 0) { Map<String, Set<String>> attributesToAdd = getUpdatePasswordAttributeValues(); for (Map.Entry<String, Set<String>> entry : attributesToAdd.entrySet()) @@ -522,37 +522,19 @@ protected String getPasswordEncoding() throws IdentityException { String encoding = getIdentityConfiguration().getValue(IdentityConfiguration.USER_PASSWORD_ENCODING); - if (encoding == null) - { - throw new IdentityException(IdentityConfiguration.USER_PASSWORD_ENCODING + " missing in configuration"); - } - else - { - return encoding; - } + return encoding; } protected Map getUpdatePasswordAttributeValues() throws IdentityException { Map attributesToAdd = getIdentityConfiguration().getOptions(IdentityConfiguration.USER_PASSWORD_UPDATE_ATTRIBUTES); - if (attributesToAdd == null) - { - throw new IdentityException(IdentityConfiguration.USER_PASSWORD_UPDATE_ATTRIBUTES + " missing in configuration"); - } return attributesToAdd; } protected String getEnclosePasswordWith() throws IdentityException { String enc = getIdentityConfiguration().getValue(IdentityConfiguration.USER_PASSWORD_ENCLOSE_WITH); - if (enc == null) - { - throw new IdentityException(IdentityConfiguration.USER_PASSWORD_ENCLOSE_WITH + " missing in configuration"); - } - else - { - return enc; - } + return enc; } }