summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Incoming.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/Incoming.cpp')
-rw-r--r--cpp/src/Ice/Incoming.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index f54520a35fb..f9a74512494 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -47,7 +47,16 @@ IceInternal::Incoming::invoke(Stream& is)
{
if (!servant)
{
- locator = _adapter->getServantLocator();
+ string::size_type pos = identity.find('#');
+ if (pos != string::npos)
+ {
+ locator = _adapter->findServantLocator(identity.substr(0, pos));
+ }
+ else
+ {
+ locator = _adapter->findServantLocator("");
+ }
+
if (locator)
{
servant = locator->locate(_adapter, identity, operation, cookie);