Author: sergeyb
Date: Mon Mar 11 12:23:12 2013
New Revision: 1455114
URL: http://svn.apache.org/r1455114
Log:
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.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1455110
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.7.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.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java?rev=1455114&r1=1455113&r2=1455114&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java
Mon Mar 11 12:23:12 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);
}
/**
