From 1ec54b38f1fad81d8e456c6c7d2e4a1d665f25b9 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 1 Mar 2023 17:39:40 +0000 Subject: assert that Mutex exists at ctor time MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and drop the never can be hit throw Change-Id: I74c92f1ff50ef0f3f6f78a53057f121a3665ec3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148072 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- package/source/xstor/owriteablestream.cxx | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'package') diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index d41e363137d0..97b78249f6d8 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -1237,6 +1237,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre } rtl::Reference tmp; + assert(m_xMutex.is() && "No mutex!"); if ( !xStream.is() ) tmp = new OWriteStream( *this, bHierarchyAccess ); else @@ -1535,10 +1536,6 @@ OWriteStream::OWriteStream( OWriteStream_Impl& rImpl, bool bTransacted ) , m_nInitPosition( 0 ) , m_bTransacted( bTransacted ) { - OSL_ENSURE( m_pImpl->m_xMutex.is(), "No mutex!" ); - - if ( !m_pImpl->m_xMutex.is() ) - throw uno::RuntimeException(); // just a disaster } OWriteStream::OWriteStream( OWriteStream_Impl& rImpl, uno::Reference< io::XStream > const & xStream, bool bTransacted ) @@ -1551,11 +1548,6 @@ OWriteStream::OWriteStream( OWriteStream_Impl& rImpl, uno::Reference< io::XStrea , m_nInitPosition( 0 ) , m_bTransacted( bTransacted ) { - OSL_ENSURE( m_pImpl->m_xMutex.is(), "No mutex!" ); - - if ( !m_pImpl->m_xMutex.is() ) - throw uno::RuntimeException(); // just a disaster - if ( xStream.is() ) { m_xInStream = xStream->getInputStream(); -- cgit v1.2.3