From 29f5d8c468d89715be66f3f99c0f444452a14176 Mon Sep 17 00:00:00 2001 From: Marc Laukien Date: Wed, 5 Dec 2001 19:13:16 +0000 Subject: Ice::Identity --- cpp/src/Ice/Direct.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'cpp/src/Ice/Direct.cpp') 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); } } -- cgit v1.2.3