details: /erp/erp/devel/main/rev/09b7fe94fb16 changeset: 5080:09b7fe94fb16 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Oct 02 19:53:46 2009 +0200 summary: Fixes bug 0010846: Randomly two account entries...
details: /erp/erp/devel/main/rev/c1061f3afdde changeset: 5081:c1061f3afdde user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Sat Oct 03 12:40:26 2009 +0200 summary: Fixes posible API break in AcctServer.java diffstat: src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 21 ++++++++++++++++----- src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 4 ++-- 2 files changed, 18 insertions(+), 7 deletions(-) diffs (82 lines): diff -r 155ef4810a15 -r c1061f3afdde src/org/openbravo/erpCommon/ad_forms/AcctServer.java --- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Fri Oct 02 11:37:29 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Sat Oct 03 12:40:26 2009 +0200 @@ -501,7 +501,7 @@ if (log4j.isDebugEnabled()) log4j.debug("post " + strClave + " tablename: " + tableName); try { - if (AcctServerData.update(con, conn, tableName, strClave) != 1) { + if (AcctServerData.update(conn, tableName, strClave) != 1) { log4j.warn("AcctServer - Post -Cannot lock Document - ignored: " + tableName + "_ID=" + strClave); return false; @@ -616,7 +616,7 @@ ; else { // conn.releaseRollbackConnection(con); - unlock(conn, con); + unlock(conn); Status = AcctServer.STATUS_Error; } } @@ -625,7 +625,7 @@ // Commit Doc if (!save(conn, con)) { // contains unlock // conn.releaseRollbackConnection(con); - unlock(conn, con); + unlock(conn); Status = AcctServer.STATUS_Error; } // conn.releaseCommitConnection(con); @@ -634,7 +634,7 @@ log4j.warn("AcctServer - postCommit" + e); Status = AcctServer.STATUS_Error; // conn.releaseRollbackConnection(con); - unlock(conn, con); + unlock(conn); } return Status; } // postCommit @@ -664,9 +664,20 @@ /** * Unlock Document */ + private void unlock(ConnectionProvider conn) { + try { + AcctServerData.updateUnlock(conn, tableName, Record_ID); + } catch (ServletException e) { + log4j.warn("AcctServer - Document locked: -" + e); + } + } // unlock + + /** + * Unlock Document + */ private void unlock(ConnectionProvider conn, Connection con) { try { - AcctServerData.updateUnlock(con, conn, tableName, Record_ID); + AcctServerData.updateUnlock(conn, tableName, Record_ID); } catch (ServletException e) { log4j.warn("AcctServer - Document locked: -" + e); } diff -r 155ef4810a15 -r c1061f3afdde src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql --- a/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql Fri Oct 02 11:37:29 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql Sat Oct 03 12:40:26 2009 +0200 @@ -54,7 +54,7 @@ <Parameter name="org"/> <Parameter name="dateColumn" type="replace" optional="true" after="ORDER BY a." text="CREATED"/> </SqlMethod> - <SqlMethod name="update" type="preparedStatement" connection="true" return="rowCount"> + <SqlMethod name="update" type="preparedStatement" return="rowCount"> <SqlMethodComment></SqlMethodComment> <Sql> <![CDATA[ @@ -167,7 +167,7 @@ <Parameter name="DateAcct"/> <Parameter name="DateAcct"/> </SqlMethod> - <SqlMethod name="updateUnlock" type="preparedStatement" connection="true" return="rowCount"> + <SqlMethod name="updateUnlock" type="preparedStatement" return="rowCount"> <SqlMethodComment></SqlMethodComment> <Sql> <![CDATA[ ------------------------------------------------------------------------------ Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now! http://p.sf.net/sfu/devconf _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits