Author: todd
Date: Tue Dec 14 04:00:27 2010
New Revision: 1048928
URL: http://svn.apache.org/viewvc?rev=1048928&view=rev
Log:
HBASE-3349. Pass HBase configuration to HttpServer
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1048928&r1=1048927&r2=1048928&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Dec 14 04:00:27 2010
@@ -1251,6 +1251,7 @@ Release 0.90.0 - Unreleased
(Nicolas Spiegelberg via Stack)
HBASE-3303 Lower hbase.regionserver.handler.count from 25 back to 10
HBASE-2467 Concurrent flushers in HLog sync using HDFS-895
+ HBASE-3349 Pass HBase configuration to HttpServer
NEW FEATURES
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java?rev=1048928&r1=1048927&r2=1048928&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/InfoServer.java Tue
Dec 14 04:00:27 2010
@@ -20,6 +20,7 @@
package org.apache.hadoop.hbase.util;
+import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.http.HttpServer;
import org.mortbay.jetty.handler.ContextHandlerCollection;
import org.mortbay.jetty.servlet.Context;
@@ -50,7 +51,7 @@ public class InfoServer extends HttpServ
*/
public InfoServer(String name, String bindAddress, int port, boolean
findPort)
throws IOException {
- super(name, bindAddress, port, findPort);
+ super(name, bindAddress, port, findPort, HBaseConfiguration.create());
webServer.addHandler(new ContextHandlerCollection());
}