summaryrefslogtreecommitdiff
path: root/connectivity/source
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2006-07-26 06:22:58 +0000
committerRüdiger Timm <rt@openoffice.org>2006-07-26 06:22:58 +0000
commit0fe2f21da78e72c939a0e304b88fac7d6c0f59ba (patch)
tree147c6497c515a31c4a6b8f360212f900cdc4292d /connectivity/source
parent78e3fd13e0fdcbcb81ed8e3acdb7670cb266ee70 (diff)
INTEGRATION: CWS dba204b (1.5.2); FILE MERGED
2006/07/13 09:56:42 fs 1.5.2.1: #i67290#
Diffstat (limited to 'connectivity/source')
-rw-r--r--connectivity/source/drivers/evoab2/NStatement.cxx17
1 files changed, 11 insertions, 6 deletions
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 0725d3b3967a..83de569988af 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: NStatement.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: kz $ $Date: 2006-07-19 09:35:52 $
+ * last change: $Author: rt $ $Date: 2006-07-26 07:22:58 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -186,10 +186,15 @@ void OStatement_Base::clearMyResultSet () throw (SQLException)
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
- Reference<XCloseable> xCloseable;
- if(::comphelper::query_interface(m_xResultSet.get(),xCloseable))
- xCloseable->close();
- m_xResultSet = Reference< XResultSet>();
+ try
+ {
+ Reference<XCloseable> xCloseable;
+ if ( ::comphelper::query_interface( m_xResultSet.get(), xCloseable ) )
+ xCloseable->close();
+ }
+ catch( const DisposedException& ) { }
+
+ m_xResultSet = Reference< XResultSet >();
}
EBookQuery *