cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1333064 - in /cxf/branches/2.5.x-fixes: ./ rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
Date Wed, 02 May 2012 14:40:30 GMT
Author: sergeyb
Date: Wed May  2 14:40:29 2012
New Revision: 1333064

URL: http://svn.apache.org/viewvc?rev=1333064&view=rev
Log:
Merged revisions 1333058 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1333058 | sergeyb | 2012-05-02 15:28:10 +0100 (Wed, 02 May 2012) | 1 line
  
  [CXF-4283] Checking OAuth10 preauthorized tokens for missing or empty verifiers, thanks
to Jordi T.
........

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/AccessTokenHandler.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1333058

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/AccessTokenHandler.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/AccessTokenHandler.java?rev=1333064&r1=1333063&r2=1333064&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
Wed May  2 14:40:29 2012
@@ -31,6 +31,7 @@ import net.oauth.OAuthMessage;
 import net.oauth.OAuthProblemException;
 
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.jaxrs.ext.MessageContext;
 import org.apache.cxf.rs.security.oauth.data.AccessToken;
 import org.apache.cxf.rs.security.oauth.data.AccessTokenRegistration;
@@ -64,7 +65,7 @@ public class AccessTokenHandler {
             }
             
             String oauthVerifier = oAuthMessage.getParameter(OAuth.OAUTH_VERIFIER);
-            if (oauthVerifier == null) {
+            if (StringUtils.isEmpty(oauthVerifier)) {
                 if (requestToken.getSubject() != null && requestToken.isPreAuthorized())
{
                     LOG.fine("Preauthorized request token");
                 } else {



Mime
View raw message