marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* viewstat.jsp: Properly close the ImageOutputStream to fix

Browse Source 
NPEs in the finalizer, probably was the root cause of
    what we blamed on Jetty
This commit is contained in:
zzz
2012-03-06 14:02:12 +00:00
parent e1c3979af7
commit de2b204646
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
View File

@ -304,6 +304,7 @@ public class StatSummarizer implements Runnable {
long period = 60*1000; long period = 60*1000;
long start = end - period*periodCount; long start = end - period*periodCount;
//long begin = System.currentTimeMillis(); //long begin = System.currentTimeMillis();
ImageOutputStream ios = null;
try { try {
RrdGraphDef def = new RrdGraphDef(); RrdGraphDef def = new RrdGraphDef();
def.setTimeSpan(start/1000, end/1000); def.setTimeSpan(start/1000, end/1000);
@ -356,7 +357,7 @@ public class StatSummarizer implements Runnable {
BufferedImage img = new BufferedImage(totalWidth, totalHeight, BufferedImage.TYPE_USHORT_565_RGB); BufferedImage img = new BufferedImage(totalWidth, totalHeight, BufferedImage.TYPE_USHORT_565_RGB);
Graphics gfx = img.getGraphics(); Graphics gfx = img.getGraphics();
graph.render(gfx); graph.render(gfx);
ImageOutputStream ios = new MemoryCacheImageOutputStream(out); ios = new MemoryCacheImageOutputStream(out);
ImageIO.write(img, "png", ios); ImageIO.write(img, "png", ios);
//File t = File.createTempFile("jrobinData", ".xml"); //File t = File.createTempFile("jrobinData", ".xml");
@ -373,6 +374,9 @@ public class StatSummarizer implements Runnable {
} catch (OutOfMemoryError oom) { } catch (OutOfMemoryError oom) {
_log.error("Error rendering", oom); _log.error("Error rendering", oom);
throw new IOException("Error plotting: " + oom.getMessage()); throw new IOException("Error plotting: " + oom.getMessage());
} finally {
// this does not close the underlying stream
if (ios != null) try {ios.close();} catch (IOException ioe) {}
} }
} }

6
apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java
View File

@ -99,6 +99,7 @@ class SummaryRenderer {
periodCount = _listener.getRows(); periodCount = _listener.getRows();
long start = end - (period * periodCount); long start = end - (period * periodCount);
//long begin = System.currentTimeMillis(); //long begin = System.currentTimeMillis();
ImageOutputStream ios = null;
try { try {
RrdGraphDef def = new RrdGraphDef(); RrdGraphDef def = new RrdGraphDef();
def.setTimeSpan(start/1000, end/1000); def.setTimeSpan(start/1000, end/1000);
@ -186,7 +187,7 @@ class SummaryRenderer {
BufferedImage img = new BufferedImage(totalWidth, totalHeight, BufferedImage.TYPE_USHORT_565_RGB); BufferedImage img = new BufferedImage(totalWidth, totalHeight, BufferedImage.TYPE_USHORT_565_RGB);
Graphics gfx = img.getGraphics(); Graphics gfx = img.getGraphics();
graph.render(gfx); graph.render(gfx);
ImageOutputStream ios = new MemoryCacheImageOutputStream(out); ios = new MemoryCacheImageOutputStream(out);
ImageIO.write(img, "png", ios); ImageIO.write(img, "png", ios);
//System.out.println("Graph created"); //System.out.println("Graph created");
@ -203,6 +204,9 @@ class SummaryRenderer {
} catch (OutOfMemoryError oom) { } catch (OutOfMemoryError oom) {
_log.error("Error rendering", oom); _log.error("Error rendering", oom);
throw new IOException("Error plotting: " + oom.getMessage()); throw new IOException("Error plotting: " + oom.getMessage());
} finally {
// this does not close the underlying stream
if (ios != null) try {ios.close();} catch (IOException ioe) {}
} }
} }