[java-identity-provider COMMIT] /trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/Abstract...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Dec 17 15:26:30 2011
New Revision: 4091

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4091&view=rev
Log:
Fix last "fix" correctly.  If a value is not the correct type do not add it, but do add other types in the input array if they are valid.

Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java?rev=4091&r1=4090&r2=4091&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java Sat Dec 17 15:26:30 2011
@@ -138,7 +138,7 @@
             if (!canEncodeValue(attribute, o)) {
                 log.debug("Skipping value of attribute {}; it can not be encoded by this encoder.", attributeId, o
                         .getClass().getName());
-                return null;
+                continue;
             }
 
             attributeValue = (EncodedType) o;