Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 0281F3A34 for ; Mon, 2 May 2011 23:52:07 +0000 (UTC) Received: (qmail 375 invoked by uid 500); 2 May 2011 23:52:06 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 348 invoked by uid 500); 2 May 2011 23:52:06 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 341 invoked by uid 99); 2 May 2011 23:52:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2011 23:52:06 +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; Mon, 02 May 2011 23:52:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 829E223888E4; Mon, 2 May 2011 23:51:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098865 - in /hadoop/common/branches/branch-0.20-security-203: CHANGES.txt src/core/org/apache/hadoop/http/HttpServer.java Date: Mon, 02 May 2011 23:51:45 -0000 To: common-commits@hadoop.apache.org From: acmurthy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110502235145.829E223888E4@eris.apache.org> Author: acmurthy Date: Mon May 2 23:51:45 2011 New Revision: 1098865 URL: http://svn.apache.org/viewvc?rev=1098865&view=rev Log: Reverting HADOOP-6386 Modified: hadoop/common/branches/branch-0.20-security-203/CHANGES.txt hadoop/common/branches/branch-0.20-security-203/src/core/org/apache/hadoop/http/HttpServer.java Modified: hadoop/common/branches/branch-0.20-security-203/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt?rev=1098865&r1=1098864&r2=1098865&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-203/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security-203/CHANGES.txt Mon May 2 23:51:45 2011 @@ -1717,9 +1717,6 @@ Release 0.20.2 - Unreleased HADOOP-6269. Fix threading issue with defaultResource in Configuration. (Sreekanth Ramakrishnan via cdouglas) - HADOOP-6386. NameNode's HttpServer can't instantiate InetSocketAddress: - IllegalArgumentException is thrown. (cos) - Release 0.20.1 - 2009-09-01 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.20-security-203/src/core/org/apache/hadoop/http/HttpServer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/src/core/org/apache/hadoop/http/HttpServer.java?rev=1098865&r1=1098864&r2=1098865&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-203/src/core/org/apache/hadoop/http/HttpServer.java (original) +++ hadoop/common/branches/branch-0.20-security-203/src/core/org/apache/hadoop/http/HttpServer.java Mon May 2 23:51:45 2011 @@ -596,33 +596,6 @@ public class HttpServer implements Filte } //Workaround end LOG.info("Jetty bound to port " + port); webServer.start(); - // Workaround for HADOOP-6386 - if (port < 0) { - Random r = new Random(1000); - for (int i = 0; i < MAX_RETRIES/2; i++) { - try { - webServer.stop(); - } catch (Exception e) { - LOG.warn("Can't stop web-server", e); - } - LOG.info("Bouncing the listener"); - listener.close(); - Thread.sleep(r.nextInt()); - listener.setPort(oriPort == 0 ? 0 : (oriPort += 1)); - listener.open(); - Thread.sleep(100); - - webServer.start(); - Thread.sleep(r.nextInt()); - port = listener.getLocalPort(); - if (port > 0) - break; - } - if (port < 0) - throw new BindException("listener.getLocalPort() is returning " + - "less than 0 even after " +MAX_RETRIES+" resets"); - } - // End of HADOOP-6386 workaround break; } catch (IOException ex) { // if this is a bind exception,