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 641C29C1B for ; Fri, 2 Mar 2012 12:53:03 +0000 (UTC) Received: (qmail 62473 invoked by uid 500); 2 Mar 2012 12:53:03 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 62429 invoked by uid 500); 2 Mar 2012 12:53:03 -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 62422 invoked by uid 99); 2 Mar 2012 12:53:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 12:53:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2012 12:53:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CB016238889B; Fri, 2 Mar 2012 12:52:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1296174 - /cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java Date: Fri, 02 Mar 2012 12:52:39 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120302125239.CB016238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Fri Mar 2 12:52:39 2012 New Revision: 1296174 URL: http://svn.apache.org/viewvc?rev=1296174&view=rev Log: Minor fix to the oauth10 module Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java?rev=1296174&r1=1296173&r2=1296174&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java (original) +++ cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java Fri Mar 2 12:52:39 2012 @@ -37,7 +37,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import javax.ws.rs.core.Response; -import javax.ws.rs.core.SecurityContext; import javax.ws.rs.core.UriBuilder; import net.oauth.OAuth; @@ -57,6 +56,7 @@ import org.apache.cxf.rs.security.oauth. import org.apache.cxf.rs.security.oauth.utils.OAuthConstants; import org.apache.cxf.rs.security.oauth.utils.OAuthUtils; import org.apache.cxf.security.LoginSecurityContext; +import org.apache.cxf.security.SecurityContext; public class AuthorizationRequestHandler { @@ -91,7 +91,7 @@ public class AuthorizationRequestHandler Map queryParams = new HashMap(); if (allow) { - SecurityContext sc = mc.getSecurityContext(); + SecurityContext sc = (SecurityContext)mc.get(SecurityContext.class.getName()); List roleNames = Collections.emptyList(); if (sc instanceof LoginSecurityContext) { roleNames = new ArrayList();