Working with Chad...

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2148 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQuery.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQuery.java
index 917c9ae..212defb 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQuery.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQuery.java
@@ -78,14 +78,9 @@ public class AttributeQuery extends AbstractProfileHandler {
         
         // construct attribute response
         List<org.opensaml.saml2.core.Attribute> encodedAttributes = new ArrayList<org.opensaml.saml2.core.Attribute>();
-        for (Attribute a: resolvedAttributes) {
-            for (AttributeEncoder<Attribute, org.opensaml.saml2.core.Attribute> e: a.getEncoders()) {
-                if (e instanceof SAML2AttributeEncoder) {
-                    // get encoder and call encode method
-                    encodedAttributes.add(e.encode(a));
-                    break;                
-                }
-            }
+        for (Attribute attr: resolvedAttributes) {
+            AttributeEncoder enc = attr.getEncoderByCategory(org.opensaml.saml2.core.Attribute.URI_REFERENCE);
+            encodedAttributes.add(enc.encode(attr));
         }
 
         Response samlResponse = buildResponse(getDecoder().getIssuer(), new DateTime(), encodedAttributes);
@@ -130,7 +125,7 @@ public class AttributeQuery extends AbstractProfileHandler {
      */
     private Status buildStatus() {
         // build status
-        SAMLObjectBuilder statusBuilder = (SAMLObjectBuilder<Status>) getBuilderFactory().getBuilder(
+        SAMLObjectBuilder<Status> statusBuilder = (SAMLObjectBuilder<Status>) getBuilderFactory().getBuilder(
                 Status.DEFAULT_ELEMENT_NAME);
         Status status = statusBuilder.buildObject();