summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Direct.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2001-12-05 19:13:16 +0000
committerMarc Laukien <marc@zeroc.com>2001-12-05 19:13:16 +0000
commit29f5d8c468d89715be66f3f99c0f444452a14176 (patch)
tree69dd25f91b7b73cc0ff48d7ceec0f89efe875926 /cpp/src/Ice/Direct.cpp
parentbug fixes (diff)
downloadice-29f5d8c468d89715be66f3f99c0f444452a14176.tar.bz2
ice-29f5d8c468d89715be66f3f99c0f444452a14176.tar.xz
ice-29f5d8c468d89715be66f3f99c0f444452a14176.zip
Ice::Identity
Diffstat (limited to 'cpp/src/Ice/Direct.cpp')
-rw-r--r--cpp/src/Ice/Direct.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp
index ef7d78e142e..d4ae9056c49 100644
--- a/cpp/src/Ice/Direct.cpp
+++ b/cpp/src/Ice/Direct.cpp
@@ -27,16 +27,12 @@ IceInternal::Direct::Direct(const ObjectAdapterPtr& adapter, const Current& curr
{
_servant = _adapter->identityToServant(_current.identity);
- if (!_servant)
+ if (!_servant && !_current.identity.category.empty())
{
- string::size_type pos = _current.identity.find('#');
- if (pos != string::npos)
+ _locator = _adapter->findServantLocator(_current.identity.category);
+ if (_locator)
{
- _locator = _adapter->findServantLocator(_current.identity.substr(0, pos));
- if (_locator)
- {
- _servant = _locator->locate(_adapter, _current, _cookie);
- }
+ _servant = _locator->locate(_adapter, _current, _cookie);
}
}