diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Direct.cpp | 14 | ||||
| -rw-r--r-- | cpp/src/Ice/Incoming.cpp | 13 |
2 files changed, 2 insertions, 25 deletions
diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp index 8af2f5c294e..ac87369a2ae 100644 --- a/cpp/src/Ice/Direct.cpp +++ b/cpp/src/Ice/Direct.cpp @@ -40,25 +40,14 @@ IceInternal::Direct::Direct(const Current& current) : try { _servant = servantManager->findServant(_current.id, _current.facet); - - if(!_servant && !_current.id.category.empty()) - { - _locator = servantManager->findServantLocator(_current.id.category); - if(_locator) - { - _servant = _locator->locate(_current, _cookie); - } - } - if(!_servant) { - _locator = servantManager->findServantLocator(""); + _locator = servantManager->findServantLocator(_current.id.category); if(_locator) { _servant = _locator->locate(_current, _cookie); } } - if(!_servant) { if(servantManager && servantManager->hasServant(_current.id)) @@ -93,7 +82,6 @@ IceInternal::Direct::Direct(const Current& current) : throw; } } - adapter->decDirectCount(); throw; } diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index ad37e29b9ee..700bf9a9257 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -142,26 +142,15 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager) if(servantManager) { _servant = servantManager->findServant(_current.id, _current.facet); - - if(!_servant && !_current.id.category.empty()) - { - _locator = servantManager->findServantLocator(_current.id.category); - if(_locator) - { - _servant = _locator->locate(_current, _cookie); - } - } - if(!_servant) { - _locator = servantManager->findServantLocator(""); + _locator = servantManager->findServantLocator(_current.id.category); if(_locator) { _servant = _locator->locate(_current, _cookie); } } } - if(!_servant) { if(servantManager && servantManager->hasServant(_current.id)) |