diff options
Diffstat (limited to 'cpp/src/Ice/Direct.cpp')
| -rw-r--r-- | cpp/src/Ice/Direct.cpp | 12 |
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); } } |