From 8bf6605e6bc08cbc3e7bfd70d03ac5f988808405 Mon Sep 17 00:00:00 2001
From: Paul Zepernick <paul.zepernick@healthsmart.com>
Date: Thu, 22 Feb 2018 10:13:14 -0500
Subject: [PATCH] WW-4923 Null check to avoid NPE when not passing a JDBC
 connection to the jasper report

---
 .../struts2/views/jasperreports/JasperReportsResult.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
index 242469024..bb089158d 100644
--- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
+++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
@@ -384,7 +384,10 @@ public class JasperReportsResult extends StrutsResultSupport implements JasperRe
             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);
             }