diff options
Diffstat (limited to 'cppe/src/IceE/ReferenceFactory.cpp')
| -rw-r--r-- | cppe/src/IceE/ReferenceFactory.cpp | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/cppe/src/IceE/ReferenceFactory.cpp b/cppe/src/IceE/ReferenceFactory.cpp index 9e6ec3278aa..c5a319d0f71 100644 --- a/cppe/src/IceE/ReferenceFactory.cpp +++ b/cppe/src/IceE/ReferenceFactory.cpp @@ -431,9 +431,10 @@ IceInternal::ReferenceFactory::create(const string& str) { #ifdef ICEE_HAS_LOCATOR # ifdef ICEE_HAS_ROUTER - return create(ident, _instance->getDefaultContext(), facet, mode, secure, "", routerInfo, locatorInfo); + return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, "", routerInfo, + locatorInfo); # else - return create(ident, _instance->getDefaultContext(), facet, mode, secure, "", locatorInfo); + return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, "", locatorInfo); # endif #else ProxyParseException ex(__FILE__, __LINE__); @@ -480,9 +481,10 @@ IceInternal::ReferenceFactory::create(const string& str) throw ex; } else if(unknownEndpoints.size() != 0 && - _instance->properties()->getPropertyAsIntWithDefault("Ice.Warn.Endpoints", 1) > 0) + _instance->initializationData().properties->getPropertyAsIntWithDefault( + "Ice.Warn.Endpoints", 1) > 0) { - Warning out(_instance->logger()); + Warning out(_instance->initializationData().logger); out << "Proxy contains unknown endpoints:"; for(unsigned int idx = 0; idx < unknownEndpoints.size(); ++idx) { @@ -491,9 +493,10 @@ IceInternal::ReferenceFactory::create(const string& str) } #ifdef ICEE_HAS_ROUTER - return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints , routerInfo); + return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, endpoints, + routerInfo); #else - return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints); + return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, endpoints); #endif break; } @@ -537,9 +540,11 @@ IceInternal::ReferenceFactory::create(const string& str) } #ifdef ICEE_HAS_ROUTER - return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapter, routerInfo, locatorInfo); + return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, adapter, + routerInfo, locatorInfo); #else - return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapter, locatorInfo); + return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, adapter, + locatorInfo); #endif break; } @@ -613,9 +618,10 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) endpoints.push_back(endpoint); } #ifdef ICEE_HAS_ROUTER - return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints, routerInfo); + return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, endpoints, + routerInfo); #else - return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints); + return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, endpoints); #endif } else @@ -624,9 +630,11 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) LocatorInfoPtr locatorInfo = _instance->locatorManager()->get(getDefaultLocator()); s->read(adapterId); # ifdef ICEE_HAS_ROUTER - return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapterId, routerInfo, locatorInfo); + return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, adapterId, + routerInfo, locatorInfo); # else - return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapterId, locatorInfo); + return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, adapterId, + locatorInfo); # endif #else throw ProxyUnmarshalException(__FILE__, __LINE__); |