FIX Review #1928

diff --git a/sonar-server/src/main/java/org/sonar/server/charts/ChartsServlet.java b/sonar-server/src/main/java/org/sonar/server/charts/ChartsServlet.java
index c56109e8940499ad8f48e410d5f478dc1c7dc300..599d9fc13f4b21918c05158c1d45a46cd54c64f3 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/charts/ChartsServlet.java
+++ b/sonar-server/src/main/java/org/sonar/server/charts/ChartsServlet.java
@@ -20,7 +20,7 @@
 package org.sonar.server.charts;
 
 import com.google.common.collect.Maps;
-import org.apache.commons.io.IOUtils;
+import com.google.common.io.Closeables;
 import org.jfree.chart.encoders.KeypointPNGEncoderAdapter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -144,21 +144,17 @@ public class ChartsServlet extends HttpServlet {
       chart = new SparkLinesChart(params);
     }
 
-    OutputStream out = null;
-    try {
-      if (chart != null) {
+    if (chart != null) {
+      OutputStream out = null;
+      try {
         out = response.getOutputStream();
         response.setContentType("image/png");
         chart.exportChartAsPNG(out);
-      }
-
-    } catch (Exception e) {
-      if (chart != null) {
+      } catch (Exception e) {
         LOG.error("Generating chart " + chart.getClass().getName(), e);
+      } finally {
+        Closeables.closeQuietly(out);
       }
-    } finally {
-      IOUtils.closeQuietly(out);
     }
   }
-
 }