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 BCF6B200AC8 for ; Mon, 23 May 2016 18:28:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BBD6F160A05; Mon, 23 May 2016 16:28:31 +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 1663B160A0E for ; Mon, 23 May 2016 18:28:30 +0200 (CEST) Received: (qmail 39342 invoked by uid 500); 23 May 2016 16:28:30 -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 39216 invoked by uid 99); 23 May 2016 16:28:30 -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; Mon, 23 May 2016 16:28:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2430FDFDEF; Mon, 23 May 2016 16:28:30 +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: Mon, 23 May 2016 16:28:31 -0000 Message-Id: <51db691a9a5f4f0a8709e8dc323fe44b@git.apache.org> In-Reply-To: <21a5bfe0dc184831ba2ff4d5e4ab6be9@git.apache.org> References: <21a5bfe0dc184831ba2ff4d5e4ab6be9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cxf git commit: NPE fix archived-at: Mon, 23 May 2016 16:28:31 -0000 NPE fix Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/194f9cd9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/194f9cd9 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/194f9cd9 Branch: refs/heads/3.1.x-fixes Commit: 194f9cd98da50140e8184ff4835811875aa5ecfe Parents: f26c82e Author: Colm O hEigeartaigh Authored: Mon May 23 17:11:33 2016 +0100 Committer: Colm O hEigeartaigh Committed: Mon May 23 17:27:25 2016 +0100 ---------------------------------------------------------------------- .../rs/security/oauth2/client/MemoryClientCodeStateManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/194f9cd9/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java index 33a95df..90b9e5c 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java @@ -56,7 +56,7 @@ public class MemoryClientCodeStateManager implements ClientCodeStateManager { MultivaluedMap redirectState) { String stateParam = redirectState.getFirst(OAuthConstants.STATE); String sessionToken = OAuthUtils.getSessionToken(mc, "state"); - if (!sessionToken.equals(stateParam)) { + if (sessionToken == null || !sessionToken.equals(stateParam)) { throw new OAuthServiceException("Invalid session token"); } return map.remove(stateParam);