Author: sergeyb Date: Mon Aug 26 12:09:22 2013 New Revision: 1517514 URL: http://svn.apache.org/r1517514 Log: Merged revisions 1517513 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................ r1517513 | sergeyb | 2013-08-26 13:04:05 +0100 (Mon, 26 Aug 2013) | 9 lines Merged revisions 1517511 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1517511 | sergeyb | 2013-08-26 13:01:54 +0100 (Mon, 26 Aug 2013) | 1 line [CXF-5226] Fixing a typo in RedirectionBasedGrantService to do with supporting public clients, thanks to Diarmuid Power ........ ................ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1517513 Merged /cxf/trunk:r1517511 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java?rev=1517514&r1=1517513&r2=1517514&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java (original) +++ cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java Mon Aug 26 12:09:22 2013 @@ -117,7 +117,7 @@ public abstract class RedirectionBasedGr String redirectUri = validateRedirectUri(client, params.getFirst(OAuthConstants.REDIRECT_URI)); // Enforce the client confidentiality requirements - if (!OAuthUtils.isGrantSupportedForClient(client, !canSupportPublicClient(client), supportedGrantType)) { + if (!OAuthUtils.isGrantSupportedForClient(client, canSupportPublicClient(client), supportedGrantType)) { return createErrorResponse(params, redirectUri, OAuthConstants.UNAUTHORIZED_CLIENT); }
