diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-02-16 14:37:01 +0100 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-02-16 14:37:01 +0100 |
| commit | 8a7f360d2fd73609a76bd7aa927acb2ef83ae5f7 (patch) | |
| tree | 873e8b09e5f9db8064713d15c3d7602ffaf076a1 /stoc | |
| parent | 750292241b4af523ed735d0e493f4d3799f6395f (diff) | |
| parent | a1f027ac6c3b0f59b2c22d4c169e6bfd03152044 (diff) | |
CWS-TOOLING: integrate CWS sb138
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/corereflection/crefl.cxx | 2 | ||||
| -rw-r--r-- | stoc/source/corereflection/lrucache.hxx | 3 | ||||
| -rw-r--r-- | stoc/source/security/file_policy.cxx | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index dac197e6f..2ea9bb228 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -179,8 +179,6 @@ void IdlReflectionServiceImpl::dispose() MutexGuard aGuard( _aComponentMutex ); _aElements.clear(); - _xTDMgr.clear(); - _xMgr.clear(); #ifdef TEST_LIST_CLASSES OSL_ENSURE( g_aClassNames.size() == 0, "### idl classes still alive!" ); ClassNameList::const_iterator iPos( g_aClassNames.begin() ); diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx index e4f6e6855..3cf8f0899 100644 --- a/stoc/source/corereflection/lrucache.hxx +++ b/stoc/source/corereflection/lrucache.hxx @@ -177,9 +177,9 @@ template< class t_Key, class t_Val, class t_KeyHash, class t_KeyEqual > inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::setValue( const t_Key & rKey, const t_Val & rValue ) { + ::osl::MutexGuard aGuard( _aCacheMutex ); if (_nCachedElements > 0) { - ::osl::MutexGuard aGuard( _aCacheMutex ); const typename t_Key2Element::const_iterator iFind( _aKey2Element.find( rKey ) ); CacheEntry * pEntry; @@ -221,6 +221,7 @@ inline void LRU_Cache< t_Key, t_Val, t_KeyHash, t_KeyEqual >::clear() _pBlock[nPos].aKey = t_Key(); _pBlock[nPos].aVal = t_Val(); } + _nCachedElements = 0; #ifdef __CACHE_DIAGNOSE OSL_TRACE( "> cleared cache <\n" ); #endif diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index 747d9dc0d..393f01d80 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -444,7 +444,6 @@ static OUString s_user = OUSTR("user"); static OUString s_permission = OUSTR("permission"); static OUString s_openBrace = OUSTR("{"); static OUString s_closingBrace = OUSTR("}"); -static OUString s_semi = OUSTR(";"); static OUString s_filePermission = OUSTR("com.sun.star.io.FilePermission"); static OUString s_socketPermission = OUSTR("com.sun.star.connection.SocketPermission"); |