diff options
| author | Michi Henning <michi@zeroc.com> | 2005-09-15 05:33:12 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2005-09-15 05:33:12 +0000 |
| commit | 2f3a891239bc3fa9565ae90278e76cafc18cc27b (patch) | |
| tree | db1cc6583c674874f76353a68ce6529c55cae0d2 /cpp/src/Ice/Direct.cpp | |
| parent | Minor edits for consistency. (diff) | |
| download | ice-2f3a891239bc3fa9565ae90278e76cafc18cc27b.tar.bz2 ice-2f3a891239bc3fa9565ae90278e76cafc18cc27b.tar.xz ice-2f3a891239bc3fa9565ae90278e76cafc18cc27b.zip | |
Bug 386.
Diffstat (limited to 'cpp/src/Ice/Direct.cpp')
| -rw-r--r-- | cpp/src/Ice/Direct.cpp | 14 |
1 files changed, 1 insertions, 13 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; } |