From a6489060efa86927c6056309072fd27138a65630 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 31 May 2011 13:31:29 +0100 Subject: this is overly static + double check lock for little gain --- fileaccess/source/FileAccess.cxx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx index 775c929f5403..1644c2724bbe 100644 --- a/fileaccess/source/FileAccess.cxx +++ b/fileaccess/source/FileAccess.cxx @@ -852,18 +852,9 @@ Reference< XInterface > SAL_CALL FileAccess_CreateInstance( const Reference< XMu Sequence< rtl::OUString > FileAccess_getSupportedServiceNames() { - static Sequence < rtl::OUString > *pNames = 0; - if( ! pNames ) - { - osl::MutexGuard guard( osl::Mutex::getGlobalMutex() ); - if( !pNames ) - { - static Sequence< rtl::OUString > seqNames(1); - seqNames.getArray()[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME )); - pNames = &seqNames; - } - } - return *pNames; + Sequence< rtl::OUString > seqNames(1); + seqNames.getArray()[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME )); + return seqNames; } -- cgit