OResultSet: close() is routinely called after dispose()

Change-Id: Ifb916e0c2935876b85fdb135538357f29cfab157

2 files changed, 1 insertions, 12 deletions

diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 45b478287ee8..f085941097de 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 6547a179f564..342ac2add17b 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 >();
 }