You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/03/02 13:56:17 UTC
svn commit: r1296180 - in /cxf/branches/2.5.x-fixes: ./
rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
Author: sergeyb
Date: Fri Mar 2 12:56:17 2012
New Revision: 1296180
URL: http://svn.apache.org/viewvc?rev=1296180&view=rev
Log:
Merged revisions 1296174 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1296174 | sergeyb | 2012-03-02 12:52:39 +0000 (Fri, 02 Mar 2012) | 1 line
Minor fix to the oauth10 module
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1296174
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/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/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java?rev=1296180&r1=1296179&r2=1296180&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java Fri Mar 2 12:56:17 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<String, String> queryParams = new HashMap<String, String>();
if (allow) {
- SecurityContext sc = mc.getSecurityContext();
+ SecurityContext sc = (SecurityContext)mc.get(SecurityContext.class.getName());
List<String> roleNames = Collections.emptyList();
if (sc instanceof LoginSecurityContext) {
roleNames = new ArrayList<String>();