diff options
| author | Marc Laukien <marc@zeroc.com> | 2001-09-27 22:41:27 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2001-09-27 22:41:27 +0000 |
| commit | 36eea2d8893de0ef19887c7feb8814b74beece0f (patch) | |
| tree | 55d4ec453a4e00a9a5b6d42c2850f1c9d8d9efc5 /cpp/src/Ice/Direct.cpp | |
| parent | more collocation stuff (diff) | |
| download | ice-36eea2d8893de0ef19887c7feb8814b74beece0f.tar.bz2 ice-36eea2d8893de0ef19887c7feb8814b74beece0f.tar.xz ice-36eea2d8893de0ef19887c7feb8814b74beece0f.zip | |
collocated evictor demo
Diffstat (limited to 'cpp/src/Ice/Direct.cpp')
| -rw-r--r-- | cpp/src/Ice/Direct.cpp | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp index f88987a7d45..59a57e1a4d0 100644 --- a/cpp/src/Ice/Direct.cpp +++ b/cpp/src/Ice/Direct.cpp @@ -35,21 +35,8 @@ IceInternal::Direct::Direct(const ObjectAdapterPtr& adapter, const ReferencePtr& _servant = _locator->locate(_adapter, _reference->identity, _operation, _cookie); } } - - if(!_servant) - { - throw ObjectNotExistException(__FILE__, __LINE__); - } - } - catch(const LocationForward&) - { - if (_locator && _servant) - { - _locator->finished(_adapter, _reference->identity, _servant, _operation, _cookie); - } - throw; } - catch(const LocalException&) + catch(...) { if (_locator && _servant) { @@ -57,13 +44,10 @@ IceInternal::Direct::Direct(const ObjectAdapterPtr& adapter, const ReferencePtr& } throw; } - catch(...) + + if(!_servant) { - if (_locator && _servant) - { - _locator->finished(_adapter, _reference->identity, _servant, _operation, _cookie); - } - throw UnknownException(__FILE__, __LINE__); + throw ObjectNotExistException(__FILE__, __LINE__); } } |