svn commit: r890930 - in /hadoop/common/branches/branch-0.20: CHANGES.txt src/core/org/apache/hadoop/http/HttpServer.java

[cos]

Author: cos
Date: Tue Dec 15 18:29:53 2009
New Revision: 890930

URL: http://svn.apache.org/viewvc?rev=890930&view=rev
Log:
HADOOP-6428. svn merge -c 889378 from trunk to branch-0.20 (cos)

Modified:
    hadoop/common/branches/branch-0.20/CHANGES.txt
    
hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/http/HttpServer.java

Modified: hadoop/common/branches/branch-0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/CHANGES.txt?rev=890930&r1=890929&r2=890930&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20/CHANGES.txt Tue Dec 15 18:29:53 2009
@@ -84,6 +84,8 @@
     HDFS-185. Disallow chown, chgrp, chmod, setQuota, and setSpaceQuota when
     name-node is in safemode. (Ravi Phulari via shv)
 
+    HADOOP-6428. HttpServer sleeps with negative values (cos)
+
 Release 0.20.1 - 2009-09-01
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/http/HttpServer.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/http/HttpServer.java?rev=890930&r1=890929&r2=890930&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/http/HttpServer.java
 (original)
+++ 
hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/http/HttpServer.java
 Tue Dec 15 18:29:53 2009
@@ -463,14 +463,13 @@
           port = listener.getLocalPort();
           if (port < 0) {
             LOG.warn("Bounds port is " + port + " after webserver start");
-            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);
               }
-              Thread.sleep(r.nextInt());
+              Thread.sleep(1000);
               
               listener.setPort(oriPort == 0 ? 0 : (oriPort += 1));
               listener.open();