mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ifb916e0c2935876b85fdb135538357f29cfab157
This commit is contained in:
Stephan Bergmann
2012-09-19 16:53:11 +02:00
parent e48e489102
commit 730ba5d732
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
connectivity/source/drivers/mork/MResultSet.cxx
View File

@@ -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();
}
// -------------------------------------------------------------------------

11
connectivity/source/drivers/mork/MStatement.cxx
View File

@@ -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 >();
}