ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#121740 fast path in cancelCommandExecution

Browse Source 
skip the cost of constructing a SimpleIOErrorRequest in the common case

Change-Id: Ib0a8989a9ffa76e6b71f984e0f32be94ec5cb8ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133959
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2022-05-07 15:26:06 +02:00
parent e855dc5226
commit a5af08b3ed
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ucbhelper/source/provider/cancelcommandexecution.cxx
+19 -6
View File
@@ -27,7 +27,9 @@
#include <rtl/ref.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <com/sun/star/ucb/CommandFailedException.hpp>
#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/ucb/XCommandProcessor.hpp>
#include <ucbhelper/interactionrequest.hxx>
#include <ucbhelper/cancelcommandexecution.hxx>
#include "simpleioerrorrequest.hxx"
@@ -80,11 +82,23 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
const uno::Reference<
ucb::XCommandProcessor > & xContext )
{
rtl::Reference< ucbhelper::SimpleIOErrorRequest > xRequest
= new ucbhelper::SimpleIOErrorRequest(
eError, rArgs, rMessage, xContext );
if ( xEnv.is() )
if ( !xEnv )
{
// Fast path
ucb::InteractiveAugmentedIOException aRequest;
aRequest.Message = rMessage;
aRequest.Context = xContext;
aRequest.Classification = task::InteractionClassification_ERROR;
aRequest.Code = eError;
aRequest.Arguments = rArgs;
cppu::throwException( uno::Any( aRequest ) );
}
else
{
rtl::Reference< ucbhelper::SimpleIOErrorRequest > xRequest
= new ucbhelper::SimpleIOErrorRequest(
eError, rArgs, rMessage, xContext );
uno::Reference<
task::XInteractionHandler > xIH = xEnv->getInteractionHandler();
if ( xIH.is() )
@@ -99,10 +113,9 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
xContext,
xRequest->getRequest() );
}
cppu::throwException( xRequest->getRequest() );
}
cppu::throwException( xRequest->getRequest() );
OSL_FAIL( "Return from cppu::throwException call!!!" );
throw uno::RuntimeException();
}