From 6f3f7ddfb65da5fd3ba666edc9ed9e4b20b2b358 Mon Sep 17 00:00:00 2001
From: "Redhuan D. Oon" <red1@red1.org>
Date: Tue, 19 Feb 2008 12:51:02 +0000
Subject: [PATCH] *BF [ 1874419 ] JDBC Statement not close in a finally block

organize imports
---
 .../org/compiere/process/AssetDelivery.java   | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/base/src/org/compiere/process/AssetDelivery.java b/base/src/org/compiere/process/AssetDelivery.java
index c6aca3867c..2985fa7d39 100644
--- a/base/src/org/compiere/process/AssetDelivery.java
+++ b/base/src/org/compiere/process/AssetDelivery.java
@@ -16,11 +16,21 @@
  *****************************************************************************/
 package org.compiere.process;
 
-import java.net.*;
-import java.sql.*;
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.net.URL;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.util.logging.Level;
+
+import org.compiere.model.MAsset;
+import org.compiere.model.MAssetDelivery;
+import org.compiere.model.MClient;
+import org.compiere.model.MMailText;
+import org.compiere.model.MProductDownload;
+import org.compiere.model.MUser;
+import org.compiere.model.MUserMail;
+import org.compiere.util.DB;
+import org.compiere.util.EMail;
 
 /**
  *	Deliver Assets Electronically
@@ -128,10 +138,11 @@ public class AssetDelivery extends SvrProcess
 		int count = 0;
 		int errors = 0;
 		int reminders = 0;
+		ResultSet rs = null;
 		try
 		{
 			stmt = DB.createStatement();
-			ResultSet rs = stmt.executeQuery(s);
+			rs = stmt.executeQuery(s);
 			while (rs.next())
 			{
 				int A_Asset_ID = rs.getInt(1);
@@ -156,25 +167,17 @@ public class AssetDelivery extends SvrProcess
 						count++;
 				}
 			}
-			rs.close();
-			stmt.close();
-			stmt = null;
-		}
+  		}
 		catch (Exception e)
 		{
 			log.log(Level.SEVERE, s, e);
 		}
 		finally
 		{
-			try
-			{
-				if (stmt != null)
-					stmt.close ();
-			}
-			catch (Exception e)
-			{}
-			stmt = null;
+			DB.close(rs, stmt);
+			rs = null; stmt = null;
 		}
+		
 		log.info("Count=" + count + ", Errors=" + errors + ", Reminder=" + reminders
 			+ " - " + (System.currentTimeMillis()-start) + "ms");
 		return "@Sent@=" + count + " - @Errors@=" + errors;