midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BF [ 1874419 ] JDBC Statement not close in a finally block 

this is a deep one to db.close, many stmt/rs closes in between removed. Need for review. Already done simple grid field entry test - ok.
This commit is contained in:
Redhuan D. Oon 2008-02-04 18:27:17 +00:00
parent e5d3c08749
commit 874cd059de
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
base/src/org/compiere/model/GridTable.java
View File

@ -1188,16 +1188,15 @@ public class GridTable extends AbstractTableModel
else // FOR UPDATE causes - ORA-01002 fetch out of sequence else // FOR UPDATE causes - ORA-01002 fetch out of sequence
select.append(" WHERE ").append(getWhereClause(rowData)); select.append(" WHERE ").append(getWhereClause(rowData));
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null;
try try
{ {
pstmt = DB.prepareStatement (select.toString(), pstmt = DB.prepareStatement (select.toString(),
ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE, null); ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE, null);
ResultSet rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
// only one row // only one row
if (!(m_inserting || rs.next())) if (!(m_inserting || rs.next()))
{ {
rs.close();
pstmt.close();
fireDataStatusEEvent("SaveErrorRowNotFound", "", true); fireDataStatusEEvent("SaveErrorRowNotFound", "", true);
dataRefresh(m_rowChanged); dataRefresh(m_rowChanged);
return SAVE_ERROR; return SAVE_ERROR;
@ -1601,8 +1600,6 @@ public class GridTable extends AbstractTableModel
createUpdateSqlReset(); createUpdateSqlReset();
else else
rs.cancelRowUpdates(); rs.cancelRowUpdates();
rs.close();
pstmt.close();
fireDataStatusEEvent("SaveErrorDataChanged", "", true); fireDataStatusEEvent("SaveErrorDataChanged", "", true);
dataRefresh(m_rowChanged); dataRefresh(m_rowChanged);
return SAVE_ERROR; return SAVE_ERROR;
@ -1646,8 +1643,6 @@ public class GridTable extends AbstractTableModel
DB.commit(true, null); // no Trx DB.commit(true, null); // no Trx
// //
lobSave(whereClause); lobSave(whereClause);
rs.close();
pstmt.close();
// Need to re-read row to get ROWID, Key, DocumentNo, Trigger, virtual columns // Need to re-read row to get ROWID, Key, DocumentNo, Trigger, virtual columns
log.fine("Reading ... " + whereClause); log.fine("Reading ... " + whereClause);
@ -1665,21 +1660,9 @@ public class GridTable extends AbstractTableModel
else else
log.log(Level.SEVERE, "Inserted row not found"); log.log(Level.SEVERE, "Inserted row not found");
// //
rs.close();
pstmt.close();
pstmt = null;
} }
catch (SQLException e) catch (SQLException e)
{ {
try
{
if (pstmt != null)
pstmt.close ();
pstmt = null;
}
catch (Exception ex)
{
}
String msg = "SaveError"; String msg = "SaveError";
if (e.getErrorCode() == 1) // Unique Constraint if (e.getErrorCode() == 1) // Unique Constraint
@ -1692,7 +1675,12 @@ public class GridTable extends AbstractTableModel
fireDataStatusEEvent(msg, e.getLocalizedMessage(), true); fireDataStatusEEvent(msg, e.getLocalizedMessage(), true);
return SAVE_ERROR; return SAVE_ERROR;
} }
finally
{
DB.close(rs, pstmt);
rs = null;
pstmt = null;
}
// everything ok // everything ok
m_rowData = null; m_rowData = null;
m_changed = false; m_changed = false;