diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-10-12 14:29:29 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-10-12 14:29:29 +0000 |
| commit | cb60212ec3c6ae9cd94a6e0cf2689938f7c10caa (patch) | |
| tree | 501bd58bb57e60445d584fbabe1115be160481e6 /java/src/IceInternal/Direct.java | |
| parent | validate identities (diff) | |
| download | ice-cb60212ec3c6ae9cd94a6e0cf2689938f7c10caa.tar.bz2 ice-cb60212ec3c6ae9cd94a6e0cf2689938f7c10caa.tar.xz ice-cb60212ec3c6ae9cd94a6e0cf2689938f7c10caa.zip | |
fixes
Diffstat (limited to 'java/src/IceInternal/Direct.java')
| -rw-r--r-- | java/src/IceInternal/Direct.java | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/java/src/IceInternal/Direct.java b/java/src/IceInternal/Direct.java index a0a715a85fd..0534745e71f 100644 --- a/java/src/IceInternal/Direct.java +++ b/java/src/IceInternal/Direct.java @@ -21,27 +21,27 @@ public final class Direct try { - _servant = _current.adapter.identityToServant(_current.id); - - if(_servant == null && _current.id.category.length() > 0) - { - _locator = _current.adapter.findServantLocator(_current.id.category); - if(_locator != null) - { - _cookie = new Ice.LocalObjectHolder(); // Lazy creation - _servant = _locator.locate(_current, _cookie); - } - } - - if(_servant == null) - { - _locator = _current.adapter.findServantLocator(""); - if(_locator != null) - { - _cookie = new Ice.LocalObjectHolder(); // Lazy creation - _servant = _locator.locate(_current, _cookie); - } - } + _servant = _current.adapter.identityToServant(_current.id); + + if(_servant == null && _current.id.category.length() > 0) + { + _locator = _current.adapter.findServantLocator(_current.id.category); + if(_locator != null) + { + _cookie = new Ice.LocalObjectHolder(); // Lazy creation + _servant = _locator.locate(_current, _cookie); + } + } + + if(_servant == null) + { + _locator = _current.adapter.findServantLocator(""); + if(_locator != null) + { + _cookie = new Ice.LocalObjectHolder(); // Lazy creation + _servant = _locator.locate(_current, _cookie); + } + } if(_servant == null) { @@ -51,7 +51,7 @@ public final class Direct ex.operation = _current.operation; throw ex; } - + if(_current.facet.length > 0) { _facetServant = _servant.ice_findFacetPath(_current.facet, 0); |