[Libreoffice-commits] .: connectivity/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/mork/MResultSet.cxx |    2 --
 connectivity/source/drivers/mork/MStatement.cxx |   11 +----------
 2 files changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 730ba5d73280c64ccf5542f879be0c370b4be54e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 19 16:53:11 2012 +0200

    OResultSet: close() is routinely called after dispose()
    
    Change-Id: Ifb916e0c2935876b85fdb135538357f29cfab157

diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 45b4782..f085941 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -511,9 +511,7 @@ void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
 
 void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException)
 {
-    ResultSetEntryGuard aGuard( *this );
     OSL_TRACE("In/Out: OResultSet::close" );
-    OSL_FAIL( "OResultSet::close: going to dispose()" );
     dispose();
 }
 // -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 6547a17..342ac2a 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -305,16 +305,7 @@ void OCommonStatement::clearCachedResultSet()
     if ( !xResultSet.is() )
         return;
 
-    try
-    {
-        Reference< XCloseable > xCloseable( xResultSet, UNO_QUERY_THROW );
-        xCloseable->close();
-    }
-    catch( const DisposedException& )
-    {
-        SAL_INFO("connectivity.mork", "=>  OCommonStatement::clearCachedResultSet()" );
-        DBG_UNHANDLED_EXCEPTION();
-    }
+    Reference< XCloseable >( xResultSet, UNO_QUERY_THROW )->close();
 
     m_xResultSet = Reference< XResultSet >();
 }