diff options
| author | Michi Henning <michi@zeroc.com> | 2002-09-24 05:36:31 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2002-09-24 05:36:31 +0000 |
| commit | bc710add2d31b9956b7297c7009400709f3c2689 (patch) | |
| tree | 36596e819544d67f9db48581d164e4e907f163e0 /cpp/src/Ice/Direct.cpp | |
| parent | Added dummy file (diff) | |
| download | ice-bc710add2d31b9956b7297c7009400709f3c2689.tar.bz2 ice-bc710add2d31b9956b7297c7009400709f3c2689.tar.xz ice-bc710add2d31b9956b7297c7009400709f3c2689.zip | |
Added adapter member to Ice::Current.
Diffstat (limited to 'cpp/src/Ice/Direct.cpp')
| -rw-r--r-- | cpp/src/Ice/Direct.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp index 107fa061bf6..b65596c6dcd 100644 --- a/cpp/src/Ice/Direct.cpp +++ b/cpp/src/Ice/Direct.cpp @@ -19,29 +19,28 @@ using namespace std; using namespace Ice; using namespace IceInternal; -IceInternal::Direct::Direct(const ObjectAdapterPtr& adapter, const Current& current) : - _adapter(adapter), +IceInternal::Direct::Direct(const Current& current) : _current(current) { try { - _servant = _adapter->identityToServant(_current.id); + _servant = current.adapter->identityToServant(_current.id); if(!_servant && !_current.id.category.empty()) { - _locator = _adapter->findServantLocator(_current.id.category); + _locator = current.adapter->findServantLocator(_current.id.category); if(_locator) { - _servant = _locator->locate(_adapter, _current, _cookie); + _servant = _locator->locate(_current, _cookie); } } if(!_servant) { - _locator = _adapter->findServantLocator(""); + _locator = current.adapter->findServantLocator(""); if(_locator) { - _servant = _locator->locate(_adapter, _current, _cookie); + _servant = _locator->locate(_current, _cookie); } } @@ -60,7 +59,7 @@ IceInternal::Direct::Direct(const ObjectAdapterPtr& adapter, const Current& curr { if(_locator && _servant) { - _locator->finished(_adapter, _current, _servant, _cookie); + _locator->finished(_current, _servant, _cookie); } throw; } @@ -77,7 +76,7 @@ IceInternal::Direct::~Direct() { if(_locator && _servant) { - _locator->finished(_adapter, _current, _servant, _cookie); + _locator->finished(_current, _servant, _cookie); } } |