diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2017-12-09 00:47:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-01-27 21:01:59 +0100 |
| commit | 25c751bc92534dca545d75ca348e895e2c335551 (patch) | |
| tree | 898d305e9b3ac809fe4f69c0ce89c534d888a74c | |
| parent | 45b5060048daac415f43b75152f3251ee8d1fead (diff) | |
tdf#70425 suppress error of closing closed cursor
Merge of:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=9585521c28b74dec36522a6501ca670b8e14c7ca
+
https://cgit.freedesktop.org/libreoffice/core/commit/?id=032a3e3713af3e308229bd8e1ada17d6d24072f3
Change-Id: Iadb0dcf83ee58b6196112c44d922528a3f56f7ea
Reviewed-on: https://gerrit.libreoffice.org/46132
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/47543
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | connectivity/source/drivers/firebird/PreparedStatement.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index a120ada7c1f9..d21037da74e5 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -258,9 +258,13 @@ sal_Bool SAL_CALL OPreparedStatement::execute() &m_aStatementHandle, DSQL_close); if (aErr) - evaluateStatusVector(m_statusVector, - "isc_dsql_free_statement: close cursor", - *this); + { + // Do not throw error. Trying to close a closed cursor is not a + // critical mistake. + OUString sErrMsg = StatusVectorToString(m_statusVector, + "isc_dsql_free_statement: close cursor"); + SAL_WARN("connectivity.firebird", sErrMsg); + } } aErr = isc_dsql_execute(m_statusVector, |