[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml: saml1/profile/impl/AddNameIdenti...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jan 28 15:41:53 2014
New Revision: 3581

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3581&view=rev
Log:
Add format parameter to NameIdentifierGenerator interface, needed for legacy NameIDEncoder support

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java?rev=3581&r1=3580&r2=3581&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java Tue Jan 28 15:41:53 2014
@@ -240,7 +240,7 @@
             for (final SAML1NameIdentifierGenerator generator : generators) {
                 if (generator != null && generator.apply(profileRequestContext)) {
                     try {
-                        final NameIdentifier nameIdentifier = generator.generate(profileRequestContext, null);
+                        final NameIdentifier nameIdentifier = generator.generate(profileRequestContext, format);
                         if (nameIdentifier != null) {
                             log.debug("{} Successfully generated NameIdentifier with Format {}", getLogPrefix(),
                                     format);

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java?rev=3581&r1=3580&r2=3581&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java Tue Jan 28 15:41:53 2014
@@ -235,7 +235,7 @@
             for (final SAML2NameIDGenerator generator : generators) {
                 if (generator != null && generator.apply(profileRequestContext)) {
                     try {
-                        final NameID nameId = generator.generate(profileRequestContext, null);
+                        final NameID nameId = generator.generate(profileRequestContext, format);
                         if (nameId != null) {
                             log.debug("{} Successfully generated NameID with Format {}", getLogPrefix(),
                                     format);