Return-Path: Delivered-To: apmail-hc-commits-archive@www.apache.org Received: (qmail 65129 invoked from network); 30 Nov 2008 15:49:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Nov 2008 15:49:55 -0000 Received: (qmail 8292 invoked by uid 500); 30 Nov 2008 15:50:07 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 8270 invoked by uid 500); 30 Nov 2008 15:50:07 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 8261 invoked by uid 99); 30 Nov 2008 15:50:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 30 Nov 2008 07:50:07 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 30 Nov 2008 15:48:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EB48323888A0; Sun, 30 Nov 2008 07:49:04 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r721833 - in /httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http: client/protocol/TestRedirects.java localserver/LocalTestServer.java Date: Sun, 30 Nov 2008 15:49:04 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081130154904.EB48323888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Sun Nov 30 07:49:04 2008 New Revision: 721833 URL: http://svn.apache.org/viewvc?rev=721833&view=rev Log: Fixed test case failing on MS Vista Modified: httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/client/protocol/TestRedirects.java httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java Modified: httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/client/protocol/TestRedirects.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/client/protocol/TestRedirects.java?rev=721833&r1=721832&r2=721833&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/client/protocol/TestRedirects.java (original) +++ httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/client/protocol/TestRedirects.java Sun Nov 30 07:49:04 2008 @@ -476,7 +476,7 @@ public void testRelativeRedirect() throws Exception { int port = this.localServer.getServicePort(); - String host = "localhost"; + String host = this.localServer.getServiceHostName(); this.localServer.register("*", new RelativeRedirectService()); DefaultHttpClient client = new DefaultHttpClient(); @@ -505,7 +505,7 @@ public void testRelativeRedirect2() throws Exception { int port = this.localServer.getServicePort(); - String host = "localhost"; + String host = this.localServer.getServiceHostName(); this.localServer.register("*", new RelativeRedirectService2()); DefaultHttpClient client = new DefaultHttpClient(); Modified: httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java?rev=721833&r1=721832&r2=721833&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java (original) +++ httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java Sun Nov 30 07:49:04 2008 @@ -291,6 +291,20 @@ /** + * Obtains the hostname of the server. + * + * @return the hostname + */ + public String getServiceHostName() { + ServerSocket ssock = servicedSocket; // avoid synchronization + if (ssock == null) + throw new IllegalStateException("not running"); + + return ((InetSocketAddress) ssock.getLocalSocketAddress()).getHostName(); + } + + + /** * Obtains the local address the server is listening on * * @return the service address