[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingp...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep 22 21:34:26 2014
New Revision: 6555

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6555&view=rev
Log:
Fix bug populating defaultAuthnMethod property.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/ShibbolethSSOProfileParser.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java?rev=6555&r1=6554&r2=6555&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileParser.java Mon Sep 22 21:34:26 2014
@@ -96,11 +96,10 @@
             final BeanDefinitionBuilder methodBuilder =
                     BeanDefinitionBuilder.genericBeanDefinition(AuthnContextClassRefPrincipal.class);
             methodBuilder.addConstructorArgValue(method);
-            List<BeanDefinition> methodsList = new ManagedList<>(1);
-
+            
+            final List<BeanDefinition> methodsList = new ManagedList<>(1);
             methodsList.add(methodBuilder.getBeanDefinition());
-
-            builder.addPropertyValue("defaultAuthenticationMethods", methodBuilder.getBeanDefinition());
+            builder.addPropertyValue("defaultAuthenticationMethods", methodsList);
         }
 
         if (parent.hasAttributeNS(null, "nameIDFormatPrecedence")) {

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/ShibbolethSSOProfileParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/ShibbolethSSOProfileParser.java?rev=6555&r1=6554&r2=6555&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/ShibbolethSSOProfileParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/ShibbolethSSOProfileParser.java Mon Sep 22 21:34:26 2014
@@ -97,11 +97,10 @@
             final BeanDefinitionBuilder methodBuilder =
                     BeanDefinitionBuilder.genericBeanDefinition(AuthenticationMethodPrincipal.class);
             methodBuilder.addConstructorArgValue(method);
-            List<BeanDefinition> methodsList = new ManagedList<>(1);
-
+            
+            final List<BeanDefinition> methodsList = new ManagedList<>(1);
             methodsList.add(methodBuilder.getBeanDefinition());
-
-            builder.addPropertyValue("defaultAuthenticationMethods", methodBuilder.getBeanDefinition());
+            builder.addPropertyValue("defaultAuthenticationMethods", methodsList);
         }
 
         if (parent.hasAttributeNS(null, "nameIDFormatPrecedence")) {