From: Victor Kirhenshtein <victor@netxms.org>
Date: Sun, 24 Jul 2016 14:30:18 +0000 (+0300)
Subject: BIRT charts generated without temporary file creation in web UI
X-Git-Tag: 2.1-M0~162
X-Git-Url: http://git.netxms.org/public/netxms.git/commitdiff_plain/e5e68018a332fd25bc321e7626d03f189e70b74a

BIRT charts generated without temporary file creation in web UI
---

diff --git a/webui/webapp/Charts/src/org/netxms/ui/eclipse/charts/widgets/GenericBirtChart.java b/webui/webapp/Charts/src/org/netxms/ui/eclipse/charts/widgets/GenericBirtChart.java
index 6e4136236..e5592f5b7 100644
--- a/webui/webapp/Charts/src/org/netxms/ui/eclipse/charts/widgets/GenericBirtChart.java
+++ b/webui/webapp/Charts/src/org/netxms/ui/eclipse/charts/widgets/GenericBirtChart.java
@@ -1,6 +1,6 @@
 /**
  * NetXMS - open source network management system
- * Copyright (C) 2003-2010 Victor Kirhenshtein
+ * Copyright (C) 2003-2016 Victor Kirhenshtein
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,9 +18,8 @@
  */
 package org.netxms.ui.eclipse.charts.widgets;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -180,35 +179,20 @@ public abstract class GenericBirtChart extends GenericChart implements PaintList
 
 			try
 			{
-				File tmpFile = File.createTempFile("birt_" + hashCode(), "_" + clientArea.width + "_" + clientArea.height);
-				tmpFile.deleteOnExit();
-
-				deviceRenderer.setProperty(IDeviceRenderer.FILE_IDENTIFIER, tmpFile);
+				ByteArrayOutputStream imgStream = new ByteArrayOutputStream(65536);
+				deviceRenderer.setProperty(IDeviceRenderer.FILE_IDENTIFIER, imgStream);
 				final Bounds bounds = BoundsImpl.create(0, 0, clientArea.width, clientArea.height);
 				bounds.scale(72.0 / deviceRenderer.getDisplayServer().getDpiResolution());
 
 				generatedChartState = generator.build(deviceRenderer.getDisplayServer(), chart, bounds, null, null, null);
 				generator.render(deviceRenderer, generatedChartState);
 
-				InputStream inputStream = null;
-				try
-				{
-					inputStream = new FileInputStream(tmpFile);
-					imgChart = new Image(getDisplay(), inputStream);
-					tmpFile.delete();
-				}
-				finally
-				{
-					if (inputStream != null)
-					{
-						inputStream.close();
-					}
-				}
+				ByteArrayInputStream inputStream = new ByteArrayInputStream(imgStream.toByteArray());
+				imgChart = new Image(getDisplay(), inputStream);
 			}
 			catch(Exception e)
 			{
-				/* TODO: add logging and/or user notification */
-				e.printStackTrace();
+			   Activator.logError("Exception during chart generation", e);
 			}
 			
 			fullRepaint = false;