Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 27F8718367 for ; Tue, 9 Feb 2016 09:45:41 +0000 (UTC) Received: (qmail 92668 invoked by uid 500); 9 Feb 2016 09:45:36 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 92552 invoked by uid 500); 9 Feb 2016 09:45:36 -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 92274 invoked by uid 99); 9 Feb 2016 09:45:35 -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; Tue, 09 Feb 2016 09:45:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B1CFEE0B13; Tue, 9 Feb 2016 09:45:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbernhardt@apache.org To: commits@cxf.apache.org Date: Tue, 09 Feb 2016 09:45:38 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/7] cxf-fediz git commit: [FEDIZ-53] Fix whr parameter reading [FEDIZ-53] Fix whr parameter reading Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b272bfa4 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b272bfa4 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b272bfa4 Branch: refs/heads/1.2.x-fixes Commit: b272bfa49f4a465452d5ca02f734028a64ea0db0 Parents: 71a1c65 Author: Jan Bernhardt Authored: Thu Jan 7 11:31:02 2016 +0100 Committer: Jan Bernhardt Committed: Tue Feb 9 08:23:54 2016 +0100 ---------------------------------------------------------------------- .../cxf/fediz/core/handler/HomeRealmCallbackHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b272bfa4/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/HomeRealmCallbackHandler.java ---------------------------------------------------------------------- diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/HomeRealmCallbackHandler.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/HomeRealmCallbackHandler.java index a87e2a0..1aa880a 100644 --- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/HomeRealmCallbackHandler.java +++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/HomeRealmCallbackHandler.java @@ -24,8 +24,8 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; +import org.apache.cxf.fediz.core.FederationConstants; import org.apache.cxf.fediz.core.spi.HomeRealmCallback; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,11 +39,11 @@ public class HomeRealmCallbackHandler implements CallbackHandler { for (int i = 0; i < callbacks.length; i++) { if (callbacks[i] instanceof HomeRealmCallback) { HomeRealmCallback callback = (HomeRealmCallback) callbacks[i]; - String homeRealm = (String)callback.getRequest().getAttribute("whr"); + String homeRealm = (String)callback.getRequest().getParameter(FederationConstants.PARAM_HOME_REALM); if (homeRealm == null || homeRealm.length() == 0) { LOG.debug("No home realm found in request"); } else { - LOG.info("Home realm '" + homeRealm + "' found in request"); + LOG.info("Home realm '{}' found in request", homeRealm); callback.setHomeRealm(homeRealm); }