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 77563F79F for ; Wed, 20 Mar 2013 12:13:21 +0000 (UTC) Received: (qmail 48414 invoked by uid 500); 20 Mar 2013 12:13:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 48333 invoked by uid 500); 20 Mar 2013 12:13:20 -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 48307 invoked by uid 99); 20 Mar 2013 12:13:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Mar 2013 12:13:19 +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, 20 Mar 2013 12:13:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6A0DD23888E4; Wed, 20 Mar 2013 12:12:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1458781 - in /cxf/branches/2.7.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java Date: Wed, 20 Mar 2013 12:12:58 -0000 To: commits@cxf.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130320121258.6A0DD23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Wed Mar 20 12:12:58 2013 New Revision: 1458781 URL: http://svn.apache.org/r1458781 Log: Merged revisions 1458773 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1458773 | ningjiang | 2013-03-20 19:42:05 +0800 (Wed, 20 Mar 2013) | 1 line CXF-4906 fixed the typo with thanks to Aki ........ Modified: cxf/branches/2.7.x-fixes/ (props changed) cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1458773 Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java?rev=1458781&r1=1458780&r2=1458781&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java (original) +++ cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java Wed Mar 20 12:12:58 2013 @@ -321,7 +321,7 @@ public class Headers { } } // make sure we don't add more than one User-Agent header - if (connection.getRequestProperty("User-Agent") != null) { + if (connection.getRequestProperty("User-Agent") == null) { connection.addRequestProperty("User-Agent", Version.getCompleteVersionString()); } }