[picketlink-commits] Picketlink SVN: r1299 - product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/web/handlers/saml2.
Author: anil.saldhana(a)jboss.com
Date: 2011-10-10 11:45:55 -0400 (Mon, 10 Oct 2011)
New Revision: 1299
Modified:
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java
Log:
PLFED-241: merge PLFED-240 move setting the destination right after determining it
Modified:
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java
===================================================================
---
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2011-10-10
15:40:56 UTC (rev 1298)
+++
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2011-10-10
15:45:55 UTC (rev 1299)
@@ -186,6 +186,8 @@
if (trace)
log.trace("Destination=" + destination);
+ response.setDestination(destination);
+
HttpSession session = BaseSAML2Handler.getHttpSession(request);
Principal userPrincipal = (Principal)
session.getAttribute(GeneralConstants.PRINCIPAL_ID);
if (userPrincipal == null)
@@ -210,7 +212,6 @@
.getAttribute(GeneralConstants.IDENTITY_SERVER);
identityServer.stack().register(session.getId(), destination, isPost);
- response.setDestination(destination);
response.setResultingDocument(samlResponse);
response.setRelayState(request.getRelayState());
response.setPostBindingForResponse(isPost);
Property changes on:
product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java
___________________________________________________________________
Added: svn:mergeinfo
+
/federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java:1159-1173,1192-1228
/federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java:1159-1173,1192-1228
/federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java:1152-1154,1159-1173,1192-1228
/federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java:1152-1173,1192-1228
/federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java:1152-1154,1159-1173
/federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java:1144-1147,1152-1173,1295-1298