svn commit: r1567222 - in /cxf/branches/2.7.x-fixes: ./ rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java

[sergeyb]

Author: sergeyb
Date: Tue Feb 11 16:58:12 2014
New Revision: 1567222

URL: http://svn.apache.org/r1567222
Log:
Merged revisions 1567216 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1567216 | sergeyb | 2014-02-11 16:52:55 +0000 (Tue, 11 Feb 2014) | 1 line
  
  [CXF-5554] Minor update
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1567216

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/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java?rev=1567222&r1=1567221&r2=1567222&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
 Tue Feb 11 16:58:12 2014
@@ -133,7 +133,8 @@ public final class OAuthUtils {
         enc = enc == null ? "UTF-8" : enc;
         
         if (params.isEmpty() 
-            && 
MediaType.APPLICATION_FORM_URLENCODED.equals(oAuthMessage.getBodyType())) {
+            && MediaType.APPLICATION_FORM_URLENCODED_TYPE.isCompatible(
+                MediaType.valueOf(oAuthMessage.getBodyType()))) {
             InputStream stream = mc != null 
                 ? mc.getContent(InputStream.class) : 
oAuthMessage.getBodyAsStream();
             String body = FormUtils.readBody(stream, enc);