summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Direct.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/Direct.cpp')
-rw-r--r--cpp/src/Ice/Direct.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp
index 59a57e1a4d0..c8a40bf63eb 100644
--- a/cpp/src/Ice/Direct.cpp
+++ b/cpp/src/Ice/Direct.cpp
@@ -29,7 +29,16 @@ IceInternal::Direct::Direct(const ObjectAdapterPtr& adapter, const ReferencePtr&
{
if (!_servant)
{
- _locator = _adapter->getServantLocator();
+ string::size_type pos = _reference->identity.find('#');
+ if (pos != string::npos)
+ {
+ _locator = _adapter->findServantLocator(_reference->identity.substr(0, pos));
+ }
+ else
+ {
+ _locator = _adapter->findServantLocator("");
+ }
+
if (_locator)
{
_servant = _locator->locate(_adapter, _reference->identity, _operation, _cookie);