From 6400fd0d45eec3d7fa44e68e7c3f78091df7f0e4 Mon Sep 17 00:00:00 2001
From: "Redhuan D. Oon" <red1@red1.org>
Date: Fri, 8 Feb 2008 10:02:07 +0000
Subject: [PATCH] *BF [ 1874419 ] JDBC Statement not close in a finally block
 Organize Imports

---
 .../org/compiere/process/OrderPOCreate.java   | 55 ++++++++-----------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/base/src/org/compiere/process/OrderPOCreate.java b/base/src/org/compiere/process/OrderPOCreate.java
index fb9aeebea9..f355fa64ea 100644
--- a/base/src/org/compiere/process/OrderPOCreate.java
+++ b/base/src/org/compiere/process/OrderPOCreate.java
@@ -16,12 +16,17 @@
  *****************************************************************************/
 package org.compiere.process;
 
-import java.awt.geom.*;
-import java.math.*;
-import java.sql.*;
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.util.*;
+import java.awt.geom.IllegalPathStateException;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.logging.Level;
+
+import org.compiere.model.MBPartner;
+import org.compiere.model.MOrder;
+import org.compiere.model.MOrderLine;
+import org.compiere.util.DB;
 
 /**
  *	Generate PO from Sales Order
@@ -114,6 +119,7 @@ public class OrderPOCreate extends SvrProcess
 				sql += "AND TRUNC(o.DateOrdered) <= ?";
 		}
 		PreparedStatement pstmt = null;
+		ResultSet rs = null;
 		int counter = 0;
 		try
 		{
@@ -139,28 +145,20 @@ public class OrderPOCreate extends SvrProcess
 				else if (p_DateOrdered_From == null && p_DateOrdered_To != null)
 					pstmt.setTimestamp(index++, p_DateOrdered_To);
 			}
-			ResultSet rs = pstmt.executeQuery ();
+			rs = pstmt.executeQuery ();
 			while (rs.next ())
 			{
 				counter += createPOFromSO (new MOrder (getCtx(), rs, get_TrxName()));
 			}
-			rs.close ();
-			pstmt.close ();
-			pstmt = null;
-		}
+ 		}
 		catch (Exception e)
 		{
 			log.log(Level.SEVERE, sql, e);
 		}
-		try
+		finally
 		{
-			if (pstmt != null)
-				pstmt.close ();
-			pstmt = null;
-		}
-		catch (Exception e)
-		{
-			pstmt = null;
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
 		}
 		if (counter == 0)
 			log.fine(sql);
@@ -190,12 +188,13 @@ public class OrderPOCreate extends SvrProcess
 			+ "WHERE ol.C_Order_ID=? AND po.IsCurrentVendor='Y' "
 			+ "ORDER BY 1";
 		PreparedStatement pstmt = null;
+		ResultSet rs = null;
 		MOrder po = null;
 		try
 		{
 			pstmt = DB.prepareStatement (sql, get_TrxName());
 			pstmt.setInt (1, so.getC_Order_ID());
-			ResultSet rs = pstmt.executeQuery ();
+			rs = pstmt.executeQuery ();
 			while (rs.next ())
 			{
 				//	New Order
@@ -227,23 +226,15 @@ public class OrderPOCreate extends SvrProcess
 					}
 				}
 			}
-			rs.close ();
-			pstmt.close ();
-			pstmt = null;
-		}
+ 		}
 		catch (Exception e)
 		{
 			log.log(Level.SEVERE, sql, e);
 		}
-		try
+		finally
 		{
-			if (pstmt != null)
-				pstmt.close ();
-			pstmt = null;
-		}
-		catch (Exception e)
-		{
-			pstmt = null;
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
 		}
 		//	Set Reference to PO
 		if (counter == 1 && po != null)