You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/01/27 13:19:29 UTC
svn commit: r1236646 - in /cxf/branches/2.4.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
Author: sergeyb
Date: Fri Jan 27 12:19:29 2012
New Revision: 1236646
URL: http://svn.apache.org/viewvc?rev=1236646&view=rev
Log:
Merged revisions 1236643 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................
r1236643 | sergeyb | 2012-01-27 12:15:39 +0000 (Fri, 27 Jan 2012) | 9 lines
Merged revisions 1236624 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1236624 | sergeyb | 2012-01-27 10:25:12 +0000 (Fri, 27 Jan 2012) | 1 line
[CXF-4067] JAX-RS proxies ignore Consumes if the body type is String
........
................
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jan 27 12:19:29 2012
@@ -0,0 +1,2 @@
+/cxf/branches/2.5.x-fixes:1236643
+/cxf/trunk:1236624
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java?rev=1236646&r1=1236645&r2=1236646&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java Fri Jan 27 12:19:29 2012
@@ -288,9 +288,7 @@ public class ClientProxyImpl extends Abs
if (formParams || bodyClass != null && MultivaluedMap.class.isAssignableFrom(bodyClass)) {
headers.putSingle(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED);
} else {
- String cType =
- bodyClass != null && InjectionUtils.isPrimitive(bodyClass)
- ? MediaType.TEXT_PLAIN : ori.getConsumeTypes().isEmpty()
+ String cType = ori.getConsumeTypes().isEmpty()
|| ori.getConsumeTypes().get(0).equals(MediaType.WILDCARD_TYPE)
? MediaType.APPLICATION_XML : ori.getConsumeTypes().get(0).toString();
headers.putSingle(HttpHeaders.CONTENT_TYPE, cType);