Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5EC8F731E for ; Wed, 3 Aug 2011 07:07:11 +0000 (UTC) Received: (qmail 27665 invoked by uid 500); 3 Aug 2011 07:06:01 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 27032 invoked by uid 500); 3 Aug 2011 07:05:42 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 26936 invoked by uid 99); 3 Aug 2011 07:05:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Aug 2011 07:05:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Aug 2011 07:05:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E20D3238896F for ; Wed, 3 Aug 2011 07:05:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1153363 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java Date: Wed, 03 Aug 2011 07:05:00 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110803070500.E20D3238896F@eris.apache.org> Author: sergeyb Date: Wed Aug 3 07:04:59 2011 New Revision: 1153363 URL: http://svn.apache.org/viewvc?rev=1153363&view=rev Log: Merged revisions 1153362 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes ................ r1153362 | sergeyb | 2011-08-03 08:01:38 +0100 (Wed, 03 Aug 2011) | 9 lines Merged revisions 1153258 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1153258 | sergeyb | 2011-08-02 20:56:35 +0100 (Tue, 02 Aug 2011) | 1 line [CXF-3703] Minor update to WebClient to avoid overriding Content-Type for GET requests ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Aug 3 07:04:59 2011 @@ -0,0 +1,2 @@ +/cxf/branches/2.4.x-fixes:1153362 +/cxf/trunk:1153258 Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java?rev=1153363&r1=1153362&r2=1153363&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java Wed Aug 3 07:04:59 2011 @@ -618,12 +618,10 @@ public class WebClient extends AbstractC protected Response doInvoke(String httpMethod, Object body, Class responseClass, Type genericType) { MultivaluedMap headers = getHeaders(); - if (body != null) { - if (headers.getFirst(HttpHeaders.CONTENT_TYPE) == null) { - headers.putSingle(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_XML_TYPE.toString()); - } - } else { - headers.putSingle(HttpHeaders.CONTENT_TYPE, MediaType.WILDCARD); + boolean contentTypeNotSet = headers.getFirst(HttpHeaders.CONTENT_TYPE) == null; + if (contentTypeNotSet) { + String ct = body != null ? MediaType.APPLICATION_XML_TYPE.toString() : "*/*"; + headers.putSingle(HttpHeaders.CONTENT_TYPE, ct); } if (responseClass != null && headers.getFirst(HttpHeaders.ACCEPT) == null) { headers.putSingle(HttpHeaders.ACCEPT, MediaType.APPLICATION_XML_TYPE.toString());