[jboss-svn-commits] JBL Code SVN: r7456 - labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/server/engine

[jboss-svn-commits at lists.jboss.org]

Author: vsellier
Date: 2006-11-07 18:42:58 -0500 (Tue, 07 Nov 2006)
New Revision: 7456

Modified:
   labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/server/engine/JasperReports.java
Log:
closing opened connection when datasource is used

Modified: labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/server/engine/JasperReports.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/server/engine/JasperReports.java	2006-11-07 23:06:26 UTC (rev 7455)
+++ labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/server/engine/JasperReports.java	2006-11-07 23:42:58 UTC (rev 7456)
@@ -11,6 +11,7 @@
 import java.io.File;
 import java.io.InputStream;
 import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.Map;
 
 import javax.naming.InitialContext;
@@ -308,8 +309,7 @@
 		JasperReport report;
 		Map final_map;
 		JREmptyDataSource empty_datasource = new JREmptyDataSource();
-		Connection final_conn;
-		Connection conn=null;
+		Connection conn = null;
 		InitialContext ctx = null;
 		
 		try{
@@ -326,14 +326,25 @@
 			{
 				try{
 					conn = ((DataSource)ctx.lookup(in_datasource_jndi_name)).getConnection();
-				}catch (Exception dse){log.error(dse.getMessage());}
+				} catch (Exception dse) {
+					log.error(dse.getMessage());
+				}
 			}
-			final_conn = conn;
 			
 			report = (JasperReport)(new InitialContext()).lookup(in_report_jndi_name);
-			JasperPrintManager.printReport(  JasperFillManager.fillReport(report, final_map, final_conn) , false  );
+			JasperPrintManager.printReport(  JasperFillManager.fillReport(report, final_map, conn) , false  );
 		}
-		catch (Exception e){e.printStackTrace();log.error("JasperReport runReport failed", e);}
+		catch (Exception e){
+			e.printStackTrace();log.error("JasperReport runReport failed", e);
+		} finally {
+			if (conn != null) {
+				try {
+					conn.close();
+				} catch(SQLException e) {
+					log.error("Unable to close datasource connection", e);
+				}
+			}
+		}
 	}