cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1455115 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
Date Mon, 11 Mar 2013 12:28:07 GMT
Author: sergeyb
Date: Mon Mar 11 12:28:06 2013
New Revision: 1455115

URL: http://svn.apache.org/r1455115
Log:
Merged revisions 1455114 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1455114 | sergeyb | 2013-03-11 12:23:12 +0000 (Mon, 11 Mar 2013) | 9 lines
  
  Merged revisions 1455110 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1455110 | sergeyb | 2013-03-11 12:16:36 +0000 (Mon, 11 Mar 2013) | 1 line
    
    [CXF-4888] Fixing OAuthClientUtils ignoring an authorizationHeader property in one of
the methods
  ........
................

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/client/OAuthClientUtils.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.7.x-fixes:r1455114
  Merged /cxf/trunk:r1455110

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/client/OAuthClientUtils.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/client/OAuthClientUtils.java?rev=1455115&r1=1455114&r2=1455115&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
Mon Mar 11 12:28:06 2013
@@ -133,7 +133,7 @@ public final class OAuthClientUtils {
         WebClient accessTokenService = 
             WebClient.create(accessTokenServiceUri, Collections.singletonList(provider));
         accessTokenService.accept("application/json");
-        return getAccessToken(accessTokenService, consumer, grant, true);
+        return getAccessToken(accessTokenService, consumer, grant, setAuthorizationHeader);
     }
     
     /**



Mime
View raw message