You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/09/26 16:17:41 UTC
svn commit: r579660 -
/lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/shibboleth/impl/AssertionConsumerServiceImpl.java
Author: andreas
Date: Wed Sep 26 07:17:41 2007
New Revision: 579660
URL: http://svn.apache.org/viewvc?rev=579660&view=rev
Log:
[minor change] code cleanup
Modified:
lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/shibboleth/impl/AssertionConsumerServiceImpl.java
Modified: lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/shibboleth/impl/AssertionConsumerServiceImpl.java
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/shibboleth/impl/AssertionConsumerServiceImpl.java?rev=579660&r1=579659&r2=579660&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/shibboleth/impl/AssertionConsumerServiceImpl.java (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/shibboleth/impl/AssertionConsumerServiceImpl.java Wed Sep 26 07:17:41 2007
@@ -211,28 +211,20 @@
if (handleService == null)
throw new RuntimeException("Error forwarding to HS: " + idpSite.getName(), null);
buffer.append(handleService);
+ buffer.append("?");
// send language if configured
// this parameter is passed to the login.jsp on shibboleth idP side,
// thus must be on the same
// parameter level as the SHIB_ATTR_TARGET parameter.
- boolean hasLanguage = false;
if (getShibbolethModule().useLanguageInReq()) {
String paramNam = getShibbolethModule().getLanguageParamName();
if (paramNam != null) {
- buffer.append("?").append(paramNam).append("=").append(locale.toString())
- .append("&");
- buffer.append(SHIB_ATTR_TARGET).append("=");
- hasLanguage = true;
+ buffer.append(paramNam).append("=").append(locale.toString()).append("&");
}
}
- if (!hasLanguage) {
- // no language configured -> this is first parameter
- buffer.append("?" + SHIB_ATTR_TARGET + "=");
- }
- // target
- buffer.append("olat");
+ buffer.append(SHIB_ATTR_TARGET).append("=olat");
// shire
buffer.append("&" + SHIB_ATTR_SHIRE + "=");
@@ -265,10 +257,9 @@
* @throws OLATRuntimeException
*/
/*
- * public void forwardToHS(UserRequest ureq, String getRequestString) throws
- * ShibbolethException { if (getLogger().isDebugEnabled()) {
- * getLogger().debug("Forwarding to HS: " + getRequestString); }
- * ureq.getDispatchResult().setResultingMediaResource( new
+ * public void forwardToHS(UserRequest ureq, String getRequestString) throws ShibbolethException {
+ * if (getLogger().isDebugEnabled()) { getLogger().debug("Forwarding to HS: " +
+ * getRequestString); } ureq.getDispatchResult().setResultingMediaResource( new
* RedirectMediaResource(getRequestString)); }
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org