summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/Initialize.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index b81059de4b4..b7d5a0246ed 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -114,10 +114,12 @@ public:
}
};
static DefaultPropertiesDestroyer defaultPropertiesDestroyer;
+static IceUtil::StaticMutex defaultPropMutex = ICE_STATIC_MUTEX_INITIALIZER;
PropertiesPtr
Ice::getDefaultProperties()
{
+ IceUtil::StaticMutex::Lock sync(defaultPropMutex);
if(!defaultProperties)
{
defaultProperties = createProperties();
@@ -128,6 +130,7 @@ Ice::getDefaultProperties()
PropertiesPtr
Ice::getDefaultProperties(StringSeq& args)
{
+ IceUtil::StaticMutex::Lock sync(defaultPropMutex);
if(!defaultProperties)
{
defaultProperties = createProperties(args);