diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-07-12 15:05:41 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-12 14:04:24 +0000 |
| commit | 63628b10bf5402c3006e60db84571d5e6e51931c (patch) | |
| tree | 1feb1279f193423c3645991c07394faa52106963 | |
| parent | f087e995e169fc348e2b5e0b65d45fd2836fd2d0 (diff) | |
tdf#100866: Don't let exception pass connectivity::release
...which is only ever called from onexcept XInterface::release overrides:
connectivity::release itself appears to be only called from
connectivity::OSubComponent::relase_ChildImpl [sic], which in turn is only
called from various XInterface::release overrides across connectivity.
(cherry picked from commit 9624bde1c36a3c1b86d8d88f97bc729ac4d65853)
Conflicts:
connectivity/source/commontools/dbtools.cxx
Change-Id: I94b682ec531acecd0ef9f8c100f67a71c361941e
Reviewed-on: https://gerrit.libreoffice.org/27147
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 10 | ||||
| -rw-r--r-- | include/connectivity/OSubComponent.hxx | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 69c1524ab555..d31c5567fe04 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1966,7 +1966,7 @@ namespace connectivity void release(oslInterlockedCount& _refCount, ::cppu::OBroadcastHelper& rBHelper, Reference< XInterface >& _xInterface, - ::com::sun::star::lang::XComponent* _pObject) + ::com::sun::star::lang::XComponent* _pObject) throw () { if (osl_atomic_decrement( &_refCount ) == 0) { @@ -1983,7 +1983,13 @@ void release(oslInterlockedCount& _refCount, } // First dispose - _pObject->dispose(); + try { + _pObject->dispose(); + } catch (css::uno::RuntimeException & e) { + SAL_WARN( + "connectivity.commontools", + "Caught exception during dispose, " << e.Message); + } // only the alive ref holds the object OSL_ASSERT( _refCount == 1 ); diff --git a/include/connectivity/OSubComponent.hxx b/include/connectivity/OSubComponent.hxx index 1aa9d151c6e6..54eaa3732106 100644 --- a/include/connectivity/OSubComponent.hxx +++ b/include/connectivity/OSubComponent.hxx @@ -43,7 +43,7 @@ namespace connectivity void release(oslInterlockedCount& _refCount, ::cppu::OBroadcastHelper& rBHelper, css::uno::Reference< css::uno::XInterface >& _xInterface, - css::lang::XComponent* _pObject); + css::lang::XComponent* _pObject) throw (); // OSubComponent @@ -70,7 +70,7 @@ namespace connectivity ::osl::MutexGuard aGuard( m_pDerivedImplementation->WEAK::rBHelper.rMutex ); m_xParent.clear(); } - void relase_ChildImpl() + void relase_ChildImpl() throw () { ::connectivity::release(m_pDerivedImplementation->m_refCount, m_pDerivedImplementation->WEAK::rBHelper, |