diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2020-05-09 13:53:23 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2020-05-09 21:17:43 +0200 |
| commit | 57cdc7f309f0863e1d8eef4a1780c3e9e2daadb5 (patch) | |
| tree | 1cda9044cf274f49063231a5b637892f5150d679 /connectivity | |
| parent | a79194007fc0522d134ca2922ef59129fe7aa354 (diff) | |
mysql-sdbc: statement: rename disposeResultset to closeResultset
it does not actually dispose teh ResulteSet, it only lets go of the reference.
Change it to actually close the ResultSet.
Change-Id: Iee51738274468f5c00e026304915ba44139a9fab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93851
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/mysqlc/mysqlc_statement.cxx | 7 | ||||
| -rw-r--r-- | connectivity/source/drivers/mysqlc/mysqlc_statement.hxx | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx index 3211fe09eff7..6b35b236361f 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx @@ -50,11 +50,12 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection) OCommonStatement::~OCommonStatement() {} -void OCommonStatement::disposeResultSet() +void OCommonStatement::closeResultSet() { - // free the cursor if alive if (m_xResultSet.is()) { + css::uno::Reference<css::sdbc::XCloseable> xClose(m_xResultSet, UNO_QUERY_THROW); + xClose->close(); m_xResultSet.clear(); m_pMysqlResult = nullptr; // it is freed by XResultSet } @@ -105,7 +106,7 @@ void SAL_CALL OCommonStatement::close() checkDisposed(rBHelper.bDisposed); } dispose(); - disposeResultSet(); + closeResultSet(); } // void SAL_CALL OStatement::clearBatch() diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx index 54d67bd9d901..9595c596401a 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx @@ -71,7 +71,7 @@ protected: sal_Int32 m_nAffectedRows = 0; protected: - void disposeResultSet(); + void closeResultSet(); // OPropertyArrayUsageHelper ::cppu::IPropertyArrayHelper* createArrayHelper() const override; |