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 C42C2E56B for ; Thu, 24 Jan 2013 17:23:30 +0000 (UTC) Received: (qmail 98461 invoked by uid 500); 24 Jan 2013 17:23:30 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 98375 invoked by uid 500); 24 Jan 2013 17:23:30 -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 98368 invoked by uid 99); 24 Jan 2013 17:23:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jan 2013 17:23:30 +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; Thu, 24 Jan 2013 17:23:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A5CD52388A91; Thu, 24 Jan 2013 17:23:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1438087 - /cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/CXFHttpAsyncRequestProducer.java Date: Thu, 24 Jan 2013 17:23:10 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130124172310.A5CD52388A91@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Jan 24 17:23:10 2013 New Revision: 1438087 URL: http://svn.apache.org/viewvc?rev=1438087&view=rev Log: Merged revisions 1438081 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1438081 | dkulp | 2013-01-24 12:18:39 -0500 (Thu, 24 Jan 2013) | 2 lines [CXF-4762] Fix hard coded mapping to port 80 which isn't needed and is wrong for https ........ Modified: cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/CXFHttpAsyncRequestProducer.java Modified: cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/CXFHttpAsyncRequestProducer.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/CXFHttpAsyncRequestProducer.java?rev=1438087&r1=1438086&r2=1438087&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/CXFHttpAsyncRequestProducer.java (original) +++ cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/CXFHttpAsyncRequestProducer.java Thu Jan 24 17:23:10 2013 @@ -59,11 +59,7 @@ public class CXFHttpAsyncRequestProducer if (!uri.isAbsolute()) { throw new IllegalStateException("Request URI is not absolute"); } - int i = uri.getPort(); - if (i == -1) { - i = 80; - } - return new HttpHost(uri.getHost(), i, uri.getScheme()); + return new HttpHost(uri.getHost(), uri.getPort(), uri.getScheme()); } public HttpRequest generateRequest() throws IOException, HttpException {