You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/10 13:14:48 UTC
cxf-fediz git commit: Fix to previous commit
Repository: cxf-fediz
Updated Branches:
refs/heads/master f7380a4ad -> 8f7cdf423
Fix to previous commit
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/8f7cdf42
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/8f7cdf42
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/8f7cdf42
Branch: refs/heads/master
Commit: 8f7cdf42355b26f2503d03ccfd72ed9b3fcb1e1b
Parents: f7380a4
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Feb 10 13:14:39 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Feb 10 13:14:39 2017 +0000
----------------------------------------------------------------------
.../core/processor/FederationProcessorImpl.java | 24 ++++++++------------
1 file changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/8f7cdf42/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java
index 41a0865..0066c11 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java
@@ -521,24 +521,20 @@ public class FederationProcessorImpl extends AbstractFedizProcessor {
}
}
+ if (logoutRedirectTo == null || logoutRedirectTo.isEmpty()) {
+ logoutRedirectTo = config.getLogoutRedirectTo();
+ }
+
if (logoutRedirectTo != null && !logoutRedirectTo.isEmpty()) {
+ if (logoutRedirectTo.startsWith("/")) {
+ logoutRedirectTo = extractFullContextPath(request).concat(logoutRedirectTo.substring(1));
+ } else if (!logoutRedirectTo.startsWith("http") && !logoutRedirectTo.startsWith("https")) {
+ logoutRedirectTo = extractFullContextPath(request).concat(logoutRedirectTo);
+ }
+
LOG.debug("wreply={}", logoutRedirectTo);
sb.append('&').append(FederationConstants.PARAM_REPLY).append('=');
sb.append(URLEncoder.encode(logoutRedirectTo, "UTF-8"));
- } else {
- logoutRedirectTo = config.getLogoutRedirectTo();
- if (logoutRedirectTo != null && !logoutRedirectTo.isEmpty()) {
-
- if (logoutRedirectTo.startsWith("/")) {
- logoutRedirectTo = extractFullContextPath(request).concat(logoutRedirectTo.substring(1));
- } else if (!logoutRedirectTo.startsWith("http") && !logoutRedirectTo.startsWith("https")) {
- logoutRedirectTo = extractFullContextPath(request).concat(logoutRedirectTo);
- }
-
- LOG.debug("wreply={}", logoutRedirectTo);
- sb.append('&').append(FederationConstants.PARAM_REPLY).append('=');
- sb.append(URLEncoder.encode(logoutRedirectTo, "UTF-8"));
- }
}
String signOutQuery = resolveSignOutQuery(request, config);