Author: atm Date: Wed Jan 22 18:13:22 2014 New Revision: 1560451 URL: http://svn.apache.org/r1560451 Log: HADOOP-10252. HttpServer can't start if hostname is not specified. Contributed by Jimmy Xiang.
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1560451&r1=1560450&r2=1560451&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jan 22 18:13:22 2014 @@ -237,6 +237,9 @@ Release 2.4.0 - UNRELEASED HADOOP-10235. Hadoop tarball has 2 versions of stax-api JARs. (tucu) + HADOOP-10252. HttpServer can't start if hostname is not specified. (Jimmy + Xiang via atm) + Release 2.3.0 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java?rev=1560451&r1=1560450&r2=1560451&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java Wed Jan 22 18:13:22 2014 @@ -455,7 +455,7 @@ public class HttpServer implements Filte public HttpServer(String name, String bindAddress, int port, boolean findPort, Configuration conf, AccessControlList adminsAcl, Connector connector, String[] pathSpecs) throws IOException { - this(new Builder().setName(name) + this(new Builder().setName(name).hostName(bindAddress) .addEndpoint(URI.create("http://" + bindAddress + ":" + port)) .setFindPort(findPort).setConf(conf).setACL(adminsAcl) .setConnector(connector).setPathSpec(pathSpecs)); Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java?rev=1560451&r1=1560450&r2=1560451&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java Wed Jan 22 18:13:22 2014 @@ -524,6 +524,17 @@ public class TestHttpServer extends Http Assert.assertFalse(HttpServer.isInstrumentationAccessAllowed(context, request, response)); } + @Test + @SuppressWarnings("deprecation") + public void testOldConstructor() throws Exception { + HttpServer server = new HttpServer("test", "0.0.0.0", 0, false); + try { + server.start(); + } finally { + server.stop(); + } + } + @Test public void testBindAddress() throws Exception { checkBindAddress("localhost", 0, false).stop(); // hang onto this one for a bit more testing