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 /java/src/IceInternal/Incoming.java | |
| parent | Minor edits for consistency. (diff) | |
| download | ice-2f3a891239bc3fa9565ae90278e76cafc18cc27b.tar.bz2 ice-2f3a891239bc3fa9565ae90278e76cafc18cc27b.tar.xz ice-2f3a891239bc3fa9565ae90278e76cafc18cc27b.zip | |
Bug 386.
Diffstat (limited to 'java/src/IceInternal/Incoming.java')
| -rw-r--r-- | java/src/IceInternal/Incoming.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/java/src/IceInternal/Incoming.java b/java/src/IceInternal/Incoming.java index 6a61a8063c4..11c433f53d0 100644 --- a/java/src/IceInternal/Incoming.java +++ b/java/src/IceInternal/Incoming.java @@ -108,26 +108,15 @@ final public class Incoming extends IncomingBase if(servantManager != null) { _servant = servantManager.findServant(_current.id, _current.facet); - - if(_servant == null && _current.id.category.length() > 0) - { - _locator = servantManager.findServantLocator(_current.id.category); - if(_locator != null) - { - _servant = _locator.locate(_current, _cookie); - } - } - if(_servant == null) { - _locator = servantManager.findServantLocator(""); + _locator = servantManager.findServantLocator(_current.id.category); if(_locator != null) { _servant = _locator.locate(_current, _cookie); } } } - if(_servant == null) { if(servantManager != null && servantManager.hasServant(_current.id)) |