diff options
Diffstat (limited to 'cpp/src/Ice/Direct.cpp')
-rw-r--r-- | cpp/src/Ice/Direct.cpp | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp index d27825ab907..b25c85fb9e1 100644 --- a/cpp/src/Ice/Direct.cpp +++ b/cpp/src/Ice/Direct.cpp @@ -39,55 +39,55 @@ IceInternal::Direct::Direct(const Current& current) : try { - _servant = servantManager->findServant(_current.id, _current.facet); - if(!_servant) - { - _locator = servantManager->findServantLocator(_current.id.category); - if(!_locator && !_current.id.category.empty()) - { - _locator = servantManager->findServantLocator(""); - } - if(_locator) - { - _servant = _locator->locate(_current, _cookie); - } - } - if(!_servant) - { - if(servantManager && servantManager->hasServant(_current.id)) - { - FacetNotExistException ex(__FILE__, __LINE__); - ex.id = _current.id; - ex.facet = _current.facet; - ex.operation = _current.operation; - throw ex; - } - else - { - ObjectNotExistException ex(__FILE__, __LINE__); - ex.id = _current.id; - ex.facet = _current.facet; - ex.operation = _current.operation; - throw ex; - } - } + _servant = servantManager->findServant(_current.id, _current.facet); + if(!_servant) + { + _locator = servantManager->findServantLocator(_current.id.category); + if(!_locator && !_current.id.category.empty()) + { + _locator = servantManager->findServantLocator(""); + } + if(_locator) + { + _servant = _locator->locate(_current, _cookie); + } + } + if(!_servant) + { + if(servantManager && servantManager->hasServant(_current.id)) + { + FacetNotExistException ex(__FILE__, __LINE__); + ex.id = _current.id; + ex.facet = _current.facet; + ex.operation = _current.operation; + throw ex; + } + else + { + ObjectNotExistException ex(__FILE__, __LINE__); + ex.id = _current.id; + ex.facet = _current.facet; + ex.operation = _current.operation; + throw ex; + } + } } catch(...) { - if(_locator && _servant) - { - try - { - _locator->finished(_current, _servant, _cookie); - } - catch(...) - { - adapter->decDirectCount(); - throw; - } - } - adapter->decDirectCount(); - throw; + if(_locator && _servant) + { + try + { + _locator->finished(_current, _servant, _cookie); + } + catch(...) + { + adapter->decDirectCount(); + throw; + } + } + adapter->decDirectCount(); + throw; } } @@ -104,15 +104,15 @@ IceInternal::Direct::destroy() if(_locator && _servant) { - try - { - _locator->finished(_current, _servant, _cookie); - } - catch(...) - { - adapter->decDirectCount(); - throw; - } + try + { + _locator->finished(_current, _servant, _cookie); + } + catch(...) + { + adapter->decDirectCount(); + throw; + } } adapter->decDirectCount(); |