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

Fix [ 1888892 ] Possible BUG on FinReport.java 

Thanks to Angelo - Genied

BF [ 1874419 ] JDBC Statement not close in a finally block
This commit is contained in:
Carlos Ruiz 2008-02-07 17:07:30 +00:00
parent 37a6123696
commit 8296c2c899
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
base/src/org/compiere/report/FinReport.java
View File

@ -176,11 +176,12 @@ public class FinReport extends SvrProcess
+ "ORDER BY p.StartDate"; + "ORDER BY p.StartDate";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null;
try try
{ {
pstmt = DB.prepareStatement(sql, null); pstmt = DB.prepareStatement(sql, null);
pstmt.setInt(1, m_report.getC_Calendar_ID()); pstmt.setInt(1, m_report.getC_Calendar_ID());
ResultSet rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
{ {
FinReportPeriod frp = new FinReportPeriod (rs.getInt(1), rs.getString(2), FinReportPeriod frp = new FinReportPeriod (rs.getInt(1), rs.getString(2),
@ -189,9 +190,6 @@ public class FinReport extends SvrProcess
if (p_C_Period_ID == 0 && frp.inPeriod(today)) if (p_C_Period_ID == 0 && frp.inPeriod(today))
p_C_Period_ID = frp.getC_Period_ID(); p_C_Period_ID = frp.getC_Period_ID();
} }
rs.close();
pstmt.close();
pstmt = null;
} }
catch (Exception e) catch (Exception e)
{ {
@ -199,14 +197,8 @@ public class FinReport extends SvrProcess
} }
finally finally
{ {
try DB.close(rs, pstmt);
{ rs = null; pstmt = null;
if (pstmt != null)
pstmt.close ();
}
catch (Exception e)
{}
pstmt = null;
} }
// convert to Array // convert to Array
m_periods = new FinReportPeriod[list.size()]; m_periods = new FinReportPeriod[list.size()];
@ -693,8 +685,27 @@ public class FinReport extends SvrProcess
private String getLineIDs (int fromID, int toID) private String getLineIDs (int fromID, int toID)
{ {
log.finest("From=" + fromID + " To=" + toID); log.finest("From=" + fromID + " To=" + toID);
int firstPA_ReportLine_ID = 0;
int lastPA_ReportLine_ID = 0;
// find the first and last ID
for (int line = 0; line < m_lines.length; line++)
{
int PA_ReportLine_ID = m_lines[line].getPA_ReportLine_ID();
if (PA_ReportLine_ID == fromID || PA_ReportLine_ID == toID)
{
if (firstPA_ReportLine_ID == 0) {
firstPA_ReportLine_ID = PA_ReportLine_ID;
} else {
lastPA_ReportLine_ID = PA_ReportLine_ID;
break;
}
}
}
// add to the list
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
sb.append(fromID); sb.append(firstPA_ReportLine_ID);
boolean addToList = false; boolean addToList = false;
for (int line = 0; line < m_lines.length; line++) for (int line = 0; line < m_lines.length; line++)
{ {
@ -704,15 +715,15 @@ public class FinReport extends SvrProcess
if (addToList) if (addToList)
{ {
sb.append (",").append (PA_ReportLine_ID); sb.append (",").append (PA_ReportLine_ID);
if (PA_ReportLine_ID == toID) // done if (PA_ReportLine_ID == lastPA_ReportLine_ID) // done
break; break;
} }
else if (PA_ReportLine_ID == fromID) // from already added else if (PA_ReportLine_ID == firstPA_ReportLine_ID) // from already added
addToList = true; addToList = true;
} }
return sb.toString(); return sb.toString();
} // getLineIDs } // getLineIDs
/** /**
* Get Column Index * Get Column Index
* @param PA_ReportColumn_ID PA_ReportColumn_ID * @param PA_ReportColumn_ID PA_ReportColumn_ID