Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8DC46200BE3 for ; Wed, 7 Dec 2016 13:13:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8AF52160AFD; Wed, 7 Dec 2016 12:13:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DA7E6160B0A for ; Wed, 7 Dec 2016 13:13:18 +0100 (CET) Received: (qmail 52759 invoked by uid 500); 7 Dec 2016 12:13:18 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 52745 invoked by uid 99); 7 Dec 2016 12:13:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2016 12:13:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DD65EE3839; Wed, 7 Dec 2016 12:13:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Wed, 07 Dec 2016 12:13:18 -0000 Message-Id: <2da2dccbde014d2eba8513ca35de9c44@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/6] cxf-fediz git commit: Fixing Logout bug archived-at: Wed, 07 Dec 2016 12:13:19 -0000 Fixing Logout bug Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/d938eea1 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/d938eea1 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/d938eea1 Branch: refs/heads/master Commit: d938eea1876980d68251f6d07b5ab94f8cdd5121 Parents: 708de3a Author: Colm O hEigeartaigh Authored: Tue Dec 6 17:34:09 2016 +0000 Committer: Colm O hEigeartaigh Committed: Tue Dec 6 17:34:09 2016 +0000 ---------------------------------------------------------------------- .../apache/cxf/fediz/core/processor/FederationProcessorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d938eea1/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 f874044..b82777b 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 @@ -500,7 +500,7 @@ public class FederationProcessorImpl extends AbstractFedizProcessor { sb.append(FederationConstants.PARAM_ACTION).append('=').append(FederationConstants.ACTION_SIGNOUT); String logoutRedirectTo = request.getParameter(FederationConstants.PARAM_REPLY); - if (logoutRedirectTo != null && !logoutRedirectTo.isEmpty()) { + if (logoutRedirectTo == null || logoutRedirectTo.isEmpty()) { logoutRedirectTo = config.getLogoutRedirectTo(); } if (logoutRedirectTo != null && !logoutRedirectTo.isEmpty()) {