From 2e5e3b9d4054548af1d37b6140427f04c9e48cb7 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 17 Mar 2011 16:16:50 +0000
Subject: [PATCH] better error messages, fix NPE, comment out template handling

---
 apps/routerconsole/jsp/viewstat.jsp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/routerconsole/jsp/viewstat.jsp b/apps/routerconsole/jsp/viewstat.jsp
index 2afa5c560..fb57b2173 100644
--- a/apps/routerconsole/jsp/viewstat.jsp
+++ b/apps/routerconsole/jsp/viewstat.jsp
@@ -8,17 +8,21 @@
  */
 
 boolean rendered = false;
+/****  unused
 String templateFile = request.getParameter("template");
 if (templateFile != null) {
   java.io.OutputStream cout = response.getOutputStream();
   response.setContentType("image/png");
   rendered = net.i2p.router.web.StatSummarizer.instance().renderPng(cout, templateFile);
 }
+****/
 net.i2p.stat.Rate rate = null;
 String stat = request.getParameter("stat");
 String period = request.getParameter("period");
 boolean fakeBw = (stat != null && ("bw.combined".equals(stat)));
-net.i2p.stat.RateStat rs = net.i2p.I2PAppContext.getGlobalContext().statManager().getRate(stat);
+net.i2p.stat.RateStat rs = null;
+if (stat != null)
+    rs = net.i2p.I2PAppContext.getGlobalContext().statManager().getRate(stat);
 if ( !rendered && ((rs != null) || fakeBw) ) {
   long per = -1;
   try {
@@ -71,6 +75,9 @@ if ( !rendered && ((rs != null) || fakeBw) ) {
  *  a huge load for a page full of graphs if there's a problem
  */
 if (!rendered) {
-  response.sendError(403, "That stat is not available");
+    if (stat != null)
+        response.sendError(403, "The stat " + stat + " is not available, it must be enabled for graphing on the stats configuration page.");
+    else
+        response.sendError(403, "No stat specified");
 }
 %>
\ No newline at end of file