summaryrefslogtreecommitdiff
path: root/fileaccess
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-05-31 13:31:29 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-06-01 15:21:18 +0100
commita6489060efa86927c6056309072fd27138a65630 (patch)
treed247d6357efd18795978584f8c79fe9074d99727 /fileaccess
parent5a3c6e0a3dc07b09352203cccdae8bf60649f487 (diff)
this is overly static + double check lock for little gain
Diffstat (limited to 'fileaccess')
-rw-r--r--fileaccess/source/FileAccess.cxx15
1 files 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;
}