[java-identity-provider COMMIT] /trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthenticat...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep  9 18:00:25 2013
New Revision: 4757

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4757&view=rev
Log:
Remove extra copy of canonical name from AuthnResult

Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthenticationFlow.java

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthenticationFlow.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthenticationFlow.java?rev=4757&r1=4756&r2=4757&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthenticationFlow.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthenticationFlow.java Mon Sep  9 18:00:25 2013
@@ -94,16 +94,14 @@
         
         log.debug("{} result of subject canonicalization: '{}'", getLogPrefix(), scContext.getPrincipalName());
         
-        authenticationResult.setCanonicalPrincipalName(scContext.getPrincipalName());
-        
         if (principalFromSession != null) {
-            if (!principalFromSession.equals(authenticationResult.getCanonicalPrincipalName())) {
+            if (!principalFromSession.equals(scContext.getPrincipalName())) {
                 log.warn("{} detected identity switch from '{}' to '{}'", getLogPrefix(), principalFromSession,
-                        authenticationResult.getCanonicalPrincipalName());
+                        scContext.getPrincipalName());
                 ActionSupport.buildEvent(profileRequestContext, AuthnEventIds.IDENTITY_SWITCH);
             }
         } else {
-            authenticationContext.setCanonicalPrincipalName(authenticationResult.getCanonicalPrincipalName());
+            authenticationContext.setCanonicalPrincipalName(scContext.getPrincipalName());
         }
     }