From 51f916f51c6cff6aa0364e92437f38b3ddf26347 Mon Sep 17 00:00:00 2001
From: teo_sarca <devnull@localhost>
Date: Thu, 24 Jan 2008 10:28:23 +0000
Subject: [PATCH] BF [ 1874419 ] JDBC Statement not close in a finally block

---
 .../org/compiere/print/MPrintFormatItem.java  | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/base/src/org/compiere/print/MPrintFormatItem.java b/base/src/org/compiere/print/MPrintFormatItem.java
index 519f0d528c..116faab278 100644
--- a/base/src/org/compiere/print/MPrintFormatItem.java
+++ b/base/src/org/compiere/print/MPrintFormatItem.java
@@ -148,23 +148,27 @@ public class MPrintFormatItem extends X_AD_PrintFormatItem
 			m_translationLabel = new HashMap<String,String>();
 			m_translationSuffix = new HashMap<String,String>();
 			String sql = "SELECT AD_Language, PrintName, PrintNameSuffix FROM AD_PrintFormatItem_Trl WHERE AD_PrintFormatItem_ID=?";
+			PreparedStatement pstmt = null;
+			ResultSet rs = null;
 			try
 			{
-				PreparedStatement pstmt = DB.prepareStatement(sql, null);
+				pstmt = DB.prepareStatement(sql, get_TrxName());
 				pstmt.setInt(1, get_ID());
-				ResultSet rs = pstmt.executeQuery();
+				rs = pstmt.executeQuery();
 				while (rs.next())
 				{
 					m_translationLabel.put (rs.getString (1), rs.getString (2));
 					m_translationSuffix.put (rs.getString (1), rs.getString (3));
 				}
-				rs.close();
-				pstmt.close();
 			}
 			catch (SQLException e)
 			{
 				log.log(Level.SEVERE, "loadTrl", e);
 			}
+			finally {
+				DB.close(rs, pstmt);
+				rs = null; pstmt = null;
+			}
 		}
 	}	//	loadTranslations
 
@@ -391,25 +395,9 @@ public class MPrintFormatItem extends X_AD_PrintFormatItem
 		if (retValue == null)
 		{
 			String sql = "SELECT ColumnName FROM AD_Column WHERE AD_Column_ID=?";
-			try
-			{
-				PreparedStatement pstmt = DB.prepareStatement(sql, null);
-				pstmt.setInt(1, AD_Column_ID.intValue());
-				ResultSet rs = pstmt.executeQuery();
-				if (rs.next())
-				{
-					retValue = rs.getString(1);
-					s_columns.put(AD_Column_ID, retValue);
-				}
-				else
-					s_log.log(Level.SEVERE, "Not found AD_Column_ID=" + AD_Column_ID);
-				rs.close();
-				pstmt.close();
-			}
-			catch (SQLException e)
-			{
-				s_log.log(Level.SEVERE, "AD_Column_ID=" + AD_Column_ID, e);
-			}
+			retValue = DB.getSQLValueString(null, sql, AD_Column_ID.intValue());
+			if (retValue != null)
+				s_columns.put(AD_Column_ID, retValue);
 		}
 		return retValue;
 	}	//	getColumnName