Fixed minor bugs introduced with recent ARP Engine refactorings. Thanks to Will...
authorwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Fri, 12 May 2006 16:17:18 +0000 (16:17 +0000)
committerwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Fri, 12 May 2006 16:17:18 +0000 (16:17 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1940 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

src/edu/internet2/middleware/shibboleth/idp/provider/ADFS_SSOHandler.java
src/edu/internet2/middleware/shibboleth/idp/provider/SAMLv1_AttributeQueryHandler.java
src/edu/internet2/middleware/shibboleth/idp/provider/ShibbolethV1SSOHandler.java

index aa2c63f..f46940e 100644 (file)
@@ -228,7 +228,7 @@ public class ADFS_SSOHandler extends SSOHandler implements IdPProtocolHandler {
 
                try {
                        Collection<? extends SAMLAttribute> attributes = support.getReleaseAttributes(principal, relyingParty,
-                                       relyingParty.getProviderId(), null);
+                                       relyingParty.getProviderId());
                        log.info("Found " + attributes.size() + " attribute(s) for " + principal.getName());
 
                        // Bail if we didn't get any attributes
index 0c4aff0..eaeb2cd 100644 (file)
@@ -236,7 +236,7 @@ public class SAMLv1_AttributeQueryHandler extends BaseServiceHandler implements
                                attrs = support.getReleaseAttributes(principal, relyingParty, effectiveName, requestedAttrs);
                        } else {
                                log.info("Request does not designate specific attributes, resolving all available.");
-                               attrs = support.getReleaseAttributes(principal, relyingParty, effectiveName, null);
+                               attrs = support.getReleaseAttributes(principal, relyingParty, effectiveName);
                        }
 
                        log.info("Found " + attrs.size() + " attribute(s) for " + principal.getName());
@@ -275,7 +275,7 @@ public class SAMLv1_AttributeQueryHandler extends BaseServiceHandler implements
                                SAMLCondition condition = new SAMLAudienceRestrictionCondition(audiences);
 
                                // Put all attributes into an assertion
-                               SAMLStatement statement = new SAMLAttributeStatement(rSubject, Arrays.asList(attrs));
+                               SAMLStatement statement = new SAMLAttributeStatement(rSubject, attrs);
 
                                // Set assertion expiration to longest attribute expiration
                                long max = 0;
index 60e4540..c9d0a4e 100644 (file)
@@ -336,7 +336,7 @@ public class ShibbolethV1SSOHandler extends SSOHandler implements IdPProtocolHan
 
                try {
                        Collection<? extends SAMLAttribute> attributes = support.getReleaseAttributes(principal, relyingParty,
-                                       relyingParty.getProviderId(), null);
+                                       relyingParty.getProviderId());
                        log.info("Found " + attributes.size() + " attribute(s) for " + principal.getName());
 
                        // Bail if we didn't get any attributes
@@ -376,7 +376,7 @@ public class ShibbolethV1SSOHandler extends SSOHandler implements IdPProtocolHan
                                SAMLCondition condition = new SAMLAudienceRestrictionCondition(audiences);
 
                                // Put all attributes into an assertion
-                               SAMLStatement statement = new SAMLAttributeStatement(attrSubject, Arrays.asList(attributes));
+                               SAMLStatement statement = new SAMLAttributeStatement(attrSubject, attributes);
 
                                // Set assertion expiration to longest attribute expiration
                                long max = 0;