svn commit: r1332284 - in /accumulo/branches/1.4: ./ src/ src/core/ src/server/ src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java

[ecn]

Author: ecn
Date: Mon Apr 30 16:40:37 2012
New Revision: 1332284

URL: http://svn.apache.org/viewvc?rev=1332284&view=rev
Log:
ACCUMULO-566 merge to 1.4

Modified:
    accumulo/branches/1.4/   (props changed)
    accumulo/branches/1.4/src/   (props changed)
    accumulo/branches/1.4/src/core/   (props changed)
    accumulo/branches/1.4/src/server/   (props changed)
    
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java

Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1332278

Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1332278

Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/core:r1332278

Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/server:r1332278
  Merged /accumulo/trunk/server:r1332278

Modified: 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java?rev=1332284&r1=1332283&r2=1332284&view=diff
==============================================================================
--- 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
 (original)
+++ 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
 Mon Apr 30 16:40:37 2012
@@ -278,9 +278,9 @@ public class DefaultServlet extends Basi
         if (fs.getUsed() != 0)
           tableRow(sb, (highlight = !highlight), 
"% of Used DFS", consumed);
         tableRow(sb, (highlight = !highlight), "<a href='/tables'>Tables</a>", 
NumberType.commas(Monitor.getTotalTables()));
-        tableRow(sb, (highlight = !highlight), "<a 
href='/tservers'>Tablet&nbsp;Servers</a>", 
NumberType.commas(info.tServerInfo.size()));
-        tableRow(sb, (highlight = !highlight), "<a 
href='/tservers'>Dead&nbsp;Tablet&nbsp;Servers</a>", 
NumberType.commas(info.deadTabletServers.size()));
-        tableRow(sb, (highlight = !highlight), "Tablets", 
NumberType.commas(Monitor.getTotalTabletCount()));
+        tableRow(sb, (highlight = !highlight), "<a 
href='/tservers'>Tablet&nbsp;Servers</a>", 
NumberType.commas(info.tServerInfo.size(), 1, Long.MAX_VALUE));
+        tableRow(sb, (highlight = !highlight), "<a 
href='/tservers'>Dead&nbsp;Tablet&nbsp;Servers</a>", 
NumberType.commas(info.deadTabletServers.size(), 0, 0));
+        tableRow(sb, (highlight = !highlight), "Tablets", 
NumberType.commas(Monitor.getTotalTabletCount(), 1, Long.MAX_VALUE));
         tableRow(sb, (highlight = !highlight), "Entries", 
NumberType.commas(Monitor.getTotalEntries()));
         tableRow(sb, (highlight = !highlight), "Lookups", 
NumberType.commas(Monitor.getTotalLookups()));
         tableRow(sb, (highlight = !highlight), "Uptime", 
Duration.format(System.currentTimeMillis() - Monitor.getStartTime()));