summaryrefslogtreecommitdiff
path: root/bridges/source/remote/urp
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2009-09-09 11:45:13 +0200
committerMathias Bauer <mba@openoffice.org>2009-09-09 11:45:13 +0200
commit0ed88426b5a379c0c5dbeffd70bc0c63e7c3641f (patch)
treea4fc38070100b360123e9566ebb9bc4934fa3e9d /bridges/source/remote/urp
parent28307fd171bf285119c305a38a34b73f42510a4a (diff)
parente53e756e9a962931a76c31c825043cb74db09742 (diff)
merge commit to DEV300_m57
Diffstat (limited to 'bridges/source/remote/urp')
-rw-r--r--bridges/source/remote/urp/urp_environment.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/bridges/source/remote/urp/urp_environment.cxx b/bridges/source/remote/urp/urp_environment.cxx
index 1e65bf66e..69a022302 100644
--- a/bridges/source/remote/urp/urp_environment.cxx
+++ b/bridges/source/remote/urp/urp_environment.cxx
@@ -342,10 +342,13 @@ static void SAL_CALL RemoteEnvironment_thisDispose( uno_Environment *pEnvRemote
pImpl->m_pReader = 0;
}
- ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() );
- if( ! g_bStaticDestructorsCalled )
+ bool bReleaseStubs = false;
+ {
+ ::osl::MutexGuard guard2( ::osl::Mutex::getGlobalMutex() );
+ bReleaseStubs = !g_bStaticDestructorsCalled;
+ }
+ if( bReleaseStubs )
{
- // delete the stubs
releaseStubs( pEnvRemote );
}
}