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

organize imports
---
 base/src/org/compiere/wf/MWorkflow.java | 44 +++++++++++++++----------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/base/src/org/compiere/wf/MWorkflow.java b/base/src/org/compiere/wf/MWorkflow.java
index 058e67ca9e..09402af624 100644
--- a/base/src/org/compiere/wf/MWorkflow.java
+++ b/base/src/org/compiere/wf/MWorkflow.java
@@ -16,12 +16,26 @@
  *****************************************************************************/
 package org.compiere.wf;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.model.*;
-import org.compiere.process.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.model.MMenu;
+import org.compiere.model.MWindow;
+import org.compiere.model.X_AD_WF_Node;
+import org.compiere.model.X_AD_Workflow;
+import org.compiere.process.ProcessInfo;
+import org.compiere.process.StateEngine;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.compiere.util.Trx;
 
 /**
  *	WorkFlow Model
@@ -72,10 +86,11 @@ public class MWorkflow extends X_AD_Workflow
 			String oldKey = "";
 			String newKey = null;
 			PreparedStatement pstmt = null;
+			ResultSet rs = null;
 			try
 			{
 				pstmt = DB.prepareStatement (sql, trxName); //Bug 1568766
-				ResultSet rs = pstmt.executeQuery ();
+				rs = pstmt.executeQuery ();
 				while (rs.next ())
 				{
 					MWorkflow wf = new MWorkflow (ctx, rs, null); 
@@ -90,24 +105,17 @@ public class MWorkflow extends X_AD_Workflow
 					oldKey = newKey;
 					list.add(wf);
 				}
-				rs.close ();
-				pstmt.close ();
-				pstmt = null;
 			}
 			catch (Exception e)
 			{
 				s_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;
 			}
+			
 			//	Last one
 			if (list.size() > 0)
 			{