summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ObjectAdapterI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 7d6028a75c8..ae6a90bbb09 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -1325,13 +1325,18 @@ ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locator
if(registerProcess && !serverId.empty())
{
- try
{
+ IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+
if(_processId.name == "")
{
ProcessPtr servant = new ProcessI(_communicator);
_processId = addWithUUID(servant)->ice_getIdentity();
}
+ }
+
+ try
+ {
locatorRegistry->setServerProcessProxy(serverId, ProcessPrx::uncheckedCast(createDirectProxy(_processId)));
}
catch(const ServerNotFoundException&)