svn commit: r1130205 - /webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java

[coheigea]

Author: coheigea
Date: Wed Jun  1 16:10:20 2011
New Revision: 1130205

URL: http://svn.apache.org/viewvc?rev=1130205&view=rev
Log:
Allow the SAML Validator to set the principal on the returned Credential.
 - This facilitiates ActAs/OnBehalfOf scenarios.

Modified:
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java?rev=1130205&r1=1130204&r2=1130205&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
 Wed Jun  1 16:10:20 2011
@@ -76,6 +76,8 @@ public class SAMLTokenProcessor implemen
                 SAMLTokenPrincipal samlPrincipal = 
                     new SAMLTokenPrincipal(credential.getTransformedToken());
                 result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
samlPrincipal);
+            } else if (credential.getPrincipal() != null) {
+                result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
credential.getPrincipal());
             } else {
                 result.put(WSSecurityEngineResult.TAG_PRINCIPAL, new 
SAMLTokenPrincipal(assertion));
             }