[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid: NameIDCano...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jan 29 17:02:38 2014
New Revision: 5273

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5273&view=rev
Log:
Fix cut and paste errors.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalization.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java?rev=5273&r1=5272&r2=5273&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java Wed Jan 29 17:02:38 2014
@@ -167,12 +167,12 @@
 
             if (duringAction) {
                 if (nameIDs == null || nameIDs.isEmpty()) {
-                    c14nContext.setException(new SubjectCanonicalizationException("No UsernamePrincipals were found"));
+                    c14nContext.setException(new SubjectCanonicalizationException("No NameIDPrincipals were found"));
                     ActionSupport.buildEvent(profileRequestContext, AuthnEventIds.INVALID_SUBJECT);
                     return false;
                 } else if (nameIDs.size() > 1) {
                     c14nContext.setException(new SubjectCanonicalizationException(
-                            "Multiple UsernamePrincipals were found"));
+                            "Multiple NameIDPrincipals were found"));
                     ActionSupport.buildEvent(profileRequestContext, AuthnEventIds.INVALID_SUBJECT);
                     return false;
                 }
@@ -185,7 +185,7 @@
 
             if (!getFormats().contains(nameID.getFormat())) {
                 if (duringAction) {
-                    c14nContext.setException(new SubjectCanonicalizationException("Format does not match found"));
+                    c14nContext.setException(new SubjectCanonicalizationException("Format not supported"));
                     ActionSupport.buildEvent(profileRequestContext, AuthnEventIds.INVALID_SUBJECT);
                 }
                 return false;

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalization.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalization.java?rev=5273&r1=5272&r2=5273&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalization.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalization.java Wed Jan 29 17:02:38 2014
@@ -169,12 +169,13 @@
 
             if (duringAction) {
                 if (nameIdentifiers == null || nameIdentifiers.isEmpty()) {
-                    c14nContext.setException(new SubjectCanonicalizationException("No UsernamePrincipals were found"));
+                    c14nContext.setException(
+                            new SubjectCanonicalizationException("No NameIdentifierPrincipals were found"));
                     ActionSupport.buildEvent(profileRequestContext, AuthnEventIds.INVALID_SUBJECT);
                     return false;
                 } else if (nameIdentifiers.size() > 1) {
                     c14nContext.setException(new SubjectCanonicalizationException(
-                            "Multiple UsernamePrincipals were found"));
+                            "Multiple NameIdentifierPrincipals were found"));
                     ActionSupport.buildEvent(profileRequestContext, AuthnEventIds.INVALID_SUBJECT);
                     return false;
                 }
@@ -187,7 +188,7 @@
 
             if (!getFormats().contains(nameIdentifier.getFormat())) {
                 if (duringAction) {
-                    c14nContext.setException(new SubjectCanonicalizationException("Format does not match found"));
+                    c14nContext.setException(new SubjectCanonicalizationException("Format not supported"));
                     ActionSupport.buildEvent(profileRequestContext, AuthnEventIds.INVALID_SUBJECT);
                 }
                 return false;