[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - connectivity/source
Tamas Bunth
tamas.bunth at collabora.co.uk
Sat Jan 27 20:02:19 UTC 2018
connectivity/source/drivers/firebird/PreparedStatement.cxx | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 25c751bc92534dca545d75ca348e895e2c335551
Author: Tamas Bunth <tamas.bunth at collabora.co.uk>
Date: Sat Dec 9 00:47:13 2017 +0100
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 at libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/47543
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
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,
More information about the Libreoffice-commits
mailing list