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 8C47E1810A for ; Mon, 2 Nov 2015 17:19:47 +0000 (UTC) Received: (qmail 51668 invoked by uid 500); 2 Nov 2015 17:19:47 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 51603 invoked by uid 500); 2 Nov 2015 17:19:47 -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 51594 invoked by uid 99); 2 Nov 2015 17:19:47 -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, 02 Nov 2015 17:19:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 40A81E0572; Mon, 2 Nov 2015 17:19:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <1277b6a8d53b410ba39e30d971c64aca@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: One more update to the oauth2 filter code Date: Mon, 2 Nov 2015 17:19:47 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 86673e7ae -> 9bb358404 One more update to the oauth2 filter code Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9bb35840 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9bb35840 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9bb35840 Branch: refs/heads/master Commit: 9bb3584045637b93bc5a24243820974544ed2e72 Parents: 86673e7 Author: Sergey Beryozkin Authored: Mon Nov 2 17:19:32 2015 +0000 Committer: Sergey Beryozkin Committed: Mon Nov 2 17:19:32 2015 +0000 ---------------------------------------------------------------------- .../security/oauth2/services/AbstractAccessTokenValidator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/9bb35840/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java index 4594e35..713318a 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java @@ -106,8 +106,9 @@ public abstract class AbstractAccessTokenValidator { accessTokenV = handler.validateAccessToken(getMessageContext(), authScheme, authSchemeData, extraProps); } catch (OAuthServiceException ex) { - AuthorizationUtils.throwAuthorizationFailure( - Collections.singleton(authScheme), realm); + AuthorizationUtils.throwAuthorizationFailure(Collections.singleton(authScheme), realm); + } catch (RuntimeException ex) { + AuthorizationUtils.throwAuthorizationFailure(Collections.singleton(authScheme), realm); } } // Default processing if no registered providers available