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/11/04 22:59:25 UTC
svn commit: r1405646 - in /cxf/branches/2.6.x-fixes: ./
rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/ImplicitGrantService.java
Author: sergeyb
Date: Sun Nov 4 21:59:25 2012
New Revision: 1405646
URL: http://svn.apache.org/viewvc?rev=1405646&view=rev
Log:
Merged revisions 1405644 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1405644 | sergeyb | 2012-11-04 21:54:25 +0000 (Sun, 04 Nov 2012) | 1 line
[CXF-4609] Fixing a typo in ImplicitGrantService, thanks to Steven Tippetts
........
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/ImplicitGrantService.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1405644
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/ImplicitGrantService.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/ImplicitGrantService.java?rev=1405646&r1=1405645&r2=1405646&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/ImplicitGrantService.java (original)
+++ cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/ImplicitGrantService.java Sun Nov 4 21:59:25 2012
@@ -56,7 +56,7 @@ public class ImplicitGrantService extend
UserSubject userSubject,
ServerAccessToken preAuthorizedToken) {
ServerAccessToken token = null;
- if (preAuthorizedToken != null) {
+ if (preAuthorizedToken == null) {
AccessTokenRegistration reg = new AccessTokenRegistration();
reg.setClient(client);
reg.setGrantType(OAuthConstants.IMPLICIT_GRANT);