Merge 8bf6605 into 02c347a

apache · Feb 22, 2018 · ef1cec6 · ef1cec6
2 parents 02c347a + 8bf6605
commit ef1cec6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...sperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/...sperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
@@ -384,7 +384,10 @@ protected void doExecute(String finalLocation, ActionInvocation invocation) thro
             throw new ServletException(e.getMessage(), e);
         } finally {
             try {
-                conn.close();
+                if(conn != null) {
+                    // avoid NPE if connection was not used for the report
+                    conn.close();
+                }
             } catch (Exception e) {
                 LOG.warn("Could not close db connection properly", e);
             }