diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-07-26 06:25:19 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-07-26 06:25:19 +0000 |
| commit | 512450d372355428eaadbb03bac7de1606b8df36 (patch) | |
| tree | 38d56d9c15aa74161be8c0cbb12a63d469bdc79e /connectivity | |
| parent | 25ffbb096fb693df4552fb221fbd8ed8a722d548 (diff) | |
INTEGRATION: CWS dba204b (1.35.16); FILE MERGED
2006/07/13 10:05:13 fs 1.35.16.1: #i67290#
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/odbc/OStatement.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 48201e6894c8..8ea85a0f872f 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -4,9 +4,9 @@ * * $RCSfile: OStatement.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: hr $ $Date: 2006-06-20 01:56:39 $ + * last change: $Author: rt $ $Date: 2006-07-26 07:25:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -275,11 +275,15 @@ void OStatement_Base::clearMyResultSet () throw (SQLException) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); + try + { + Reference<XCloseable> xCloseable; + if ( ::comphelper::query_interface( m_xResultSet.get(), xCloseable ) ) + xCloseable->close(); + } + catch( const DisposedException& ) { } - Reference<XCloseable> xCloseable; - if(::comphelper::query_interface(m_xResultSet.get(),xCloseable)) - xCloseable->close(); - m_xResultSet = Reference< XResultSet>(); + m_xResultSet = Reference< XResultSet >(); } //-------------------------------------------------------------------- sal_Int32 OStatement_Base::getRowCount () throw( SQLException) |