Close csv & writer properly when downloading report (#3526)

CHANGELOG.md

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 
 - #3471 - EmailService not working due to unsatisfied reference to MailTemplateManager in AEM on prem
 - #3497 - Redirect Manager: allow creating redirect configurations in a nested hierarchy
+- #3526 - Downloading report causes "Writer already closed" error
 
 ## 6.9.10 - 2024-12-13
 

bundle/src/main/java/com/adobe/acs/commons/reports/internal/ReportCSVExportServlet.java

@@ -29,7 +29,6 @@
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
@@ -79,14 +78,16 @@ protected void doGet(@NotNull SlingHttpServletRequest request, @NotNull SlingHtt
             + ".csv");
 
     Writer writer = null;
+    Csv csv = null;
+
     try {
       writer = response.getWriter();
 
       // write the BOM to indicate this is a UTF-8 file
       writer.write("\uFEFF");
 
       // initialize the csv
-      final Csv csv = new Csv();
+      csv = new Csv();
       csv.setFieldSeparatorWrite(delimiterConfiguration.getFieldDelimiter());
       csv.writeInit(writer);
 
@@ -106,14 +107,15 @@ protected void doGet(@NotNull SlingHttpServletRequest request, @NotNull SlingHtt
             log.warn("Unable to export report for configuration: {}", config);
           }
         }
-        csv.close();
       } else {
         throw new IOException("No configurations found for " + request.getResource());
       }
     } catch (ReportException e) {
       throw new ServletException("Exception extracting report to CSV", e);
     } finally {
-      IOUtils.closeQuietly(writer);
+      if (csv != null) {
+        csv.close();
+      }
     }
   }