diff options
Diffstat (limited to 'cpp/src/Ice/Direct.cpp')
| -rw-r--r-- | cpp/src/Ice/Direct.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp index c8a40bf63eb..d1efbf2cb69 100644 --- a/cpp/src/Ice/Direct.cpp +++ b/cpp/src/Ice/Direct.cpp @@ -23,22 +23,26 @@ IceInternal::Direct::Direct(const ObjectAdapterPtr& adapter, const ReferencePtr& _reference(ref), _operation(operation) { - _servant = _adapter->identityToServant(_reference->identity); - try { + _servant = _adapter->identityToServant(_reference->identity); + if (!_servant) { string::size_type pos = _reference->identity.find('#'); if (pos != string::npos) { _locator = _adapter->findServantLocator(_reference->identity.substr(0, pos)); + if (_locator) + { + _servant = _locator->locate(_adapter, _reference->identity, _operation, _cookie); + } } - else - { - _locator = _adapter->findServantLocator(""); - } + } + if (!_servant) + { + _locator = _adapter->findServantLocator(""); if (_locator) { _servant = _locator->locate(_adapter, _reference->identity, _operation, _cookie); |