summaryrefslogtreecommitdiff
path: root/cppe/src/IceE/ObjectAdapter.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2006-07-28 20:35:26 +0000
committerBernard Normier <bernard@zeroc.com>2006-07-28 20:35:26 +0000
commita7270eb607bf5602b6f10dbd2e78da18e4f3d6fb (patch)
treeef3ca6c6da06abf84b16fcb3eff00f36ab5d65d3 /cppe/src/IceE/ObjectAdapter.cpp
parentcleaning up the Ruby settings (diff)
downloadice-a7270eb607bf5602b6f10dbd2e78da18e4f3d6fb.tar.bz2
ice-a7270eb607bf5602b6f10dbd2e78da18e4f3d6fb.tar.xz
ice-a7270eb607bf5602b6f10dbd2e78da18e4f3d6fb.zip
restored setDefaultContext
Diffstat (limited to 'cppe/src/IceE/ObjectAdapter.cpp')
-rw-r--r--cppe/src/IceE/ObjectAdapter.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp
index 012d5a16b52..e9b6a88e774 100644
--- a/cppe/src/IceE/ObjectAdapter.cpp
+++ b/cppe/src/IceE/ObjectAdapter.cpp
@@ -519,7 +519,7 @@ Ice::ObjectAdapter::createReverseProxy(const Identity& ident) const
// reference.
//
vector<EndpointPtr> endpoints;
- ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->initializationData().defaultContext, "",
+ ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(), "",
Reference::ModeTwoway, connections);
return _instance->proxyFactory()->referenceToProxy(ref);
}
@@ -775,10 +775,10 @@ 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, _instance->initializationData().defaultContext,
+ ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(),
facet, Reference::ModeTwoway, false, endpoints, 0);
#else
- ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->initializationData().defaultContext,
+ ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(),
facet, Reference::ModeTwoway, false, endpoints);
#endif
return _instance->proxyFactory()->referenceToProxy(ref);
@@ -793,11 +793,11 @@ 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, _instance->initializationData().defaultContext,
+ ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(),
facet, Reference::ModeTwoway, false, id, 0, _locatorInfo);
#else
- ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->initializationData().defaultContext,
+ ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(),
facet, Reference::ModeTwoway, false, id, _locatorInfo);
#endif