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/ReferenceFactory.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/ReferenceFactory.cpp')
| -rw-r--r-- | cppe/src/IceE/ReferenceFactory.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cppe/src/IceE/ReferenceFactory.cpp b/cppe/src/IceE/ReferenceFactory.cpp index 59cad2db6aa..f35ae9b0528 100644 --- a/cppe/src/IceE/ReferenceFactory.cpp +++ b/cppe/src/IceE/ReferenceFactory.cpp @@ -430,9 +430,9 @@ IceInternal::ReferenceFactory::create(const string& str) { #ifdef ICEE_HAS_LOCATOR # ifdef ICEE_HAS_ROUTER - return create(ident, Context(), facet, mode, secure, "", routerInfo, locatorInfo); + return create(ident, _instance->getDefaultContext(), facet, mode, secure, "", routerInfo, locatorInfo); # else - return create(ident, Context(), facet, mode, secure, "", locatorInfo); + return create(ident, _instance->getDefaultContext(), facet, mode, secure, "", locatorInfo); # endif #else ProxyParseException ex(__FILE__, __LINE__); @@ -489,9 +489,9 @@ IceInternal::ReferenceFactory::create(const string& str) } #ifdef ICEE_HAS_ROUTER - return create(ident, Context(), facet, mode, secure, endpoints , routerInfo); + return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints , routerInfo); #else - return create(ident, Context(), facet, mode, secure, endpoints); + return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints); #endif break; } @@ -535,9 +535,9 @@ IceInternal::ReferenceFactory::create(const string& str) } #ifdef ICEE_HAS_ROUTER - return create(ident, Context(), facet, mode, secure, adapter, routerInfo, locatorInfo); + return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapter, routerInfo, locatorInfo); #else - return create(ident, Context(), facet, mode, secure, adapter, locatorInfo); + return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapter, locatorInfo); #endif break; } @@ -611,9 +611,9 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) endpoints.push_back(endpoint); } #ifdef ICEE_HAS_ROUTER - return create(ident, Context(), facet, mode, secure, endpoints, routerInfo); + return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints, routerInfo); #else - return create(ident, Context(), facet, mode, secure, endpoints); + return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints); #endif } else @@ -622,9 +622,9 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) LocatorInfoPtr locatorInfo = _instance->locatorManager()->get(getDefaultLocator()); s->read(adapterId); # ifdef ICEE_HAS_ROUTER - return create(ident, Context(), facet, mode, secure, adapterId, routerInfo, locatorInfo); + return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapterId, routerInfo, locatorInfo); # else - return create(ident, Context(), facet, mode, secure, adapterId, locatorInfo); + return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapterId, locatorInfo); # endif #else throw ProxyUnmarshalException(__FILE__, __LINE__); |