svn commit: r1362720 - 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

[sergeyb]

Author: sergeyb
Date: Tue Jul 17 23:02:48 2012
New Revision: 1362720

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

........
  r1362693 | sergeyb | 2012-07-17 23:35:27 +0100 (Tue, 17 Jul 2012) | 1 line
  
  [CXF-4429] Properly checking the status code in the OAuth2 client code
........

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/trunk:r1362693

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=1362720&r1=1362719&r2=1362720&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
 Tue Jul 17 23:02:48 2012
@@ -188,7 +188,7 @@ public final class OAuthClientUtils {
             } else {
                 return token;
             }
-        } else if (400 == response.getStatus() && 
map.containsValue(OAuthConstants.ERROR_KEY)) {
+        } else if (400 == response.getStatus() && 
map.containsKey(OAuthConstants.ERROR_KEY)) {
             OAuthError error = new 
OAuthError(map.get(OAuthConstants.ERROR_KEY),
                                               
map.get(OAuthConstants.ERROR_DESCRIPTION_KEY));
             error.setErrorUri(map.get(OAuthConstants.ERROR_URI_KEY));