[java-identity-provider COMMIT] in /trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute: StringAttribu...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Apr  4 16:18:56 2012
New Revision: 4162

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4162&view=rev
Log:
Fix regressions flushed by the Assert->Constraint work

Modified:
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/logic/LookupAttributeFromAttributeContextFunction.java

Modified: trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java?rev=4162&r1=4161&r2=4162&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java (original)
+++ trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/StringAttributeValue.java Wed Apr  4 16:18:56 2012
@@ -37,7 +37,7 @@
      * @param attributeValue the attribute value
      */
     public StringAttributeValue(@Nonnull @NotEmpty String attributeValue) {
-        value = Constraint.isNotNull(StringSupport.trim(attributeValue), "Attribute value can not be null or empty");
+        value = Constraint.isNotNull(StringSupport.trimOrNull(attributeValue), "Attribute value can not be null or empty");
     }
 
     /**

Modified: trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/logic/LookupAttributeFromAttributeContextFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/logic/LookupAttributeFromAttributeContextFunction.java?rev=4162&r1=4161&r2=4162&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/logic/LookupAttributeFromAttributeContextFunction.java (original)
+++ trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/logic/LookupAttributeFromAttributeContextFunction.java Wed Apr  4 16:18:56 2012
@@ -23,6 +23,7 @@
 import net.shibboleth.idp.attribute.AttributeContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.messaging.context.BaseContext;
 
@@ -46,7 +47,7 @@
      * @param attributeId ID of the attribute
      */
     public LookupAttributeFromAttributeContextFunction(@Nonnull @NotEmpty final String attributeId) {
-        id = Constraint.isNotNull(attributeId, "Attribute ID can not be null");
+        id = Constraint.isNotNull(StringSupport.trimOrNull(attributeId), "Attribute ID can not be null");
     }
 
     /** {@inheritDoc} */