User: rt      
Date: 2006/07/26 00:25:21

Modified:
   dba/connectivity/source/drivers/odbc/OStatement.cxx

Log:
 INTEGRATION: CWS dba204b (1.35.16); FILE MERGED
 2006/07/13 10:05:13 fs 1.35.16.1: #i67290#

File Changes:

Directory: /dba/connectivity/source/drivers/odbc/
=================================================

File [changed]: OStatement.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/OStatement.cxx?r1=1.35&r2=1.36
Delta lines:  +8 -4
-------------------
--- OStatement.cxx      20 Jun 2006 01:56:39 -0000      1.35
+++ OStatement.cxx      26 Jul 2006 07:25:19 -0000      1.36
@@ -275,11 +275,15 @@
        ::osl::MutexGuard aGuard( m_aMutex );
        checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
-
+    try
+    {
        Reference<XCloseable> xCloseable;
-       if(::comphelper::query_interface(m_xResultSet.get(),xCloseable))
+           if ( ::comphelper::query_interface( m_xResultSet.get(), xCloseable 
) )
                xCloseable->close();
-       m_xResultSet = Reference< XResultSet>();
+    }
+    catch( const DisposedException& ) { }
+
+    m_xResultSet = Reference< XResultSet >();
 }
 //--------------------------------------------------------------------
 sal_Int32 OStatement_Base::getRowCount () throw( SQLException)




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to