hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r656456 - in /hadoop/hbase/trunk/src/webapps/master: WEB-INF/web.xml table.jsp
Date Wed, 14 May 2008 22:41:58 GMT
Author: stack
Date: Wed May 14 15:41:58 2008
New Revision: 656456

URL: http://svn.apache.org/viewvc?rev=656456&view=rev
Log:
HBASE-23 Fix bug introduced by my edits of JDC's patch

Modified:
    hadoop/hbase/trunk/src/webapps/master/WEB-INF/web.xml
    hadoop/hbase/trunk/src/webapps/master/table.jsp

Modified: hadoop/hbase/trunk/src/webapps/master/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/webapps/master/WEB-INF/web.xml?rev=656456&r1=656455&r2=656456&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/webapps/master/WEB-INF/web.xml (original)
+++ hadoop/hbase/trunk/src/webapps/master/WEB-INF/web.xml Wed May 14 15:41:58 2008
@@ -10,11 +10,6 @@
 
 
     <servlet>
-        <servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
-        <servlet-class>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-class>
-    </servlet>
-
-    <servlet>
         <servlet-name>org.apache.hadoop.hbase.generated.master.hql_jsp</servlet-name>
         <servlet-class>org.apache.hadoop.hbase.generated.master.hql_jsp</servlet-class>
     </servlet>
@@ -24,10 +19,10 @@
         <servlet-class>org.apache.hadoop.hbase.generated.master.master_jsp</servlet-class>
     </servlet>
 
-    <servlet-mapping>
+    <servlet>
         <servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
-        <url-pattern>/table.jsp</url-pattern>
-    </servlet-mapping>
+        <servlet-class>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-class>
+    </servlet>
 
     <servlet-mapping>
         <servlet-name>org.apache.hadoop.hbase.generated.master.hql_jsp</servlet-name>
@@ -39,5 +34,10 @@
         <url-pattern>/master.jsp</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>org.apache.hadoop.hbase.generated.master.table_jsp</servlet-name>
+        <url-pattern>/table.jsp</url-pattern>
+    </servlet-mapping>
+
 </web-app>
 

Modified: hadoop/hbase/trunk/src/webapps/master/table.jsp
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/webapps/master/table.jsp?rev=656456&r1=656455&r2=656456&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/webapps/master/table.jsp (original)
+++ hadoop/hbase/trunk/src/webapps/master/table.jsp Wed May 14 15:41:58 2008
@@ -57,7 +57,7 @@
 <%      for(Map.Entry<HRegionInfo, HServerAddress> hriEntry : regions.entrySet())
{ %>
 <%        System.out.println(serverToServerInfos.keySet().toArray()[0].toString());
           System.out.println(hriEntry.getValue().getHostname()+":"+hriEntry.getValue().getPort());
-          int infoPort = serverToServerInfos.get(hriEntry.getValue().getHostname()+":"+hriEntry.getValue().getPort()).getInfoPort();
+          int infoPort = serverToServerInfos.get(hriEntry.getValue().getBindAddress()+":"+hriEntry.getValue().getPort()).getInfoPort();
           String url = "http://" + hriEntry.getValue().getHostname().toString() + ":" + infoPort
+ "/";  %>
 <tr><td><%= hriEntry.getKey().getRegionName()%></td><td><a
href="<%= url %>"><%= hriEntry.getValue().getHostname() %>:<%= hriEntry.getValue().getPort()
%></a></td>
     <td><%= hriEntry.getKey().getEncodedName()%></td> <td><%=
hriEntry.getKey().getStartKey()%></td>



Mime
View raw message