diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-01-24 17:32:41 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-01-24 17:32:41 +0000 |
| commit | 04a38e5e00cb2be1a4198a0ae73c8d44a0c910b9 (patch) | |
| tree | c49e27187a696b5b794f56ba5102ff857469f717 /cppe/src/IceE/ObjectAdapter.cpp | |
| parent | - Removed reference to RH9 and LinuxThreads from INSTALL.LINUX (diff) | |
| download | ice-04a38e5e00cb2be1a4198a0ae73c8d44a0c910b9.tar.bz2 ice-04a38e5e00cb2be1a4198a0ae73c8d44a0c910b9.tar.xz ice-04a38e5e00cb2be1a4198a0ae73c8d44a0c910b9.zip | |
Ported some Ice changes wrt default context
Diffstat (limited to 'cppe/src/IceE/ObjectAdapter.cpp')
| -rw-r--r-- | cppe/src/IceE/ObjectAdapter.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp index 250418cbc44..bc6b5c22b98 100644 --- a/cppe/src/IceE/ObjectAdapter.cpp +++ b/cppe/src/IceE/ObjectAdapter.cpp @@ -468,7 +468,8 @@ Ice::ObjectAdapter::createReverseProxy(const Identity& ident) const // reference. // vector<EndpointPtr> endpoints; - ReferencePtr ref = _instance->referenceFactory()->create(ident, Context(), "", Reference::ModeTwoway, connections); + ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(), "", + Reference::ModeTwoway, connections); return _instance->proxyFactory()->referenceToProxy(ref); } @@ -821,11 +822,11 @@ Ice::ObjectAdapter::newDirectProxy(const Identity& ident, const string& facet) c // Create a reference and return a proxy for this reference. // #ifdef ICEE_HAS_ROUTER - ReferencePtr ref = _instance->referenceFactory()->create(ident, Context(), facet, Reference::ModeTwoway, false, - endpoints, 0); + ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(), facet, + Reference::ModeTwoway, false, endpoints, 0); #else - ReferencePtr ref = _instance->referenceFactory()->create(ident, Context(), facet, Reference::ModeTwoway, false, - endpoints); + ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(), facet, + Reference::ModeTwoway, false, endpoints); #endif return _instance->proxyFactory()->referenceToProxy(ref); @@ -839,12 +840,12 @@ Ice::ObjectAdapter::newIndirectProxy(const Identity& ident, const string& facet, // Create a reference with the adapter id. // #ifdef ICEE_HAS_ROUTER - ReferencePtr ref = _instance->referenceFactory()->create(ident, Context(), facet,Reference::ModeTwoway, false, - id, 0, _locatorInfo); + ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(), facet, + Reference::ModeTwoway, false, id, 0, _locatorInfo); #else - ReferencePtr ref = _instance->referenceFactory()->create(ident, Context(), facet, Reference::ModeTwoway, false, - id, _locatorInfo); + ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(), facet, + Reference::ModeTwoway, false, id, _locatorInfo); #endif // |