You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:17:25 UTC
svn commit: r1077461 -
/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java
Author: omalley
Date: Fri Mar 4 04:17:25 2011
New Revision: 1077461
URL: http://svn.apache.org/viewvc?rev=1077461&view=rev
Log:
commit 52c6d0e83c1abee40580dc3e8edc5ac5445926eb
Author: Konstantin Boudnik <co...@yahoo-inc.com>
Date: Thu May 13 19:08:04 2010 -0700
HADOOP-6760 from https://issues.apache.org/jira/secure/attachment/12444455/HADOOP-6760.0.20.patch
This change essentially reverts the following commits:
3245e2bd33f90aaa24cddbb3af5ec829fac30cb6
9e136abc4eaf13b4dea357b05467b16d11df5729
+++ b/YAHOO-CHANGES.txt
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java?rev=1077461&r1=1077460&r2=1077461&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/http/HttpServer.java Fri Mar 4 04:17:25 2011
@@ -553,32 +553,6 @@ public class HttpServer implements Filte
} //Workaround end
LOG.info("Jetty bound to port " + port);
webServer.start();
- // Workaround for HADOOP-6386
- port = listener.getLocalPort();
- if (port < 0) {
- LOG.warn("Bounds port is " + port + " after webserver start");
- for (int i = 0; i < MAX_RETRIES/2; i++) {
- try {
- webServer.stop();
- } catch (Exception e) {
- LOG.warn("Can't stop web-server", e);
- }
- Thread.sleep(1000);
-
- listener.setPort(oriPort == 0 ? 0 : (oriPort += 1));
- listener.open();
- Thread.sleep(100);
- webServer.start();
- LOG.info(i + "attempts to restart webserver");
- port = listener.getLocalPort();
- if (port > 0)
- break;
- }
- if (port < 0)
- throw new Exception("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,