diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-07-20 20:17:51 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-07-20 20:17:51 +0000 |
| commit | 55363a13e1c750b39db419c5312217b9256f1fec (patch) | |
| tree | 76aa0e305ccd7a3db64e7e03703f74e2dadb0c34 /cpp/src/Ice/ReferenceFactory.cpp | |
| parent | file Communicator.cpp was initially added on branch R3_1_branch. (diff) | |
| download | ice-55363a13e1c750b39db419c5312217b9256f1fec.tar.bz2 ice-55363a13e1c750b39db419c5312217b9256f1fec.tar.xz ice-55363a13e1c750b39db419c5312217b9256f1fec.zip | |
Merge from R3_1_branch
Diffstat (limited to 'cpp/src/Ice/ReferenceFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ReferenceFactory.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp index 79705f6251f..8331460765f 100644 --- a/cpp/src/Ice/ReferenceFactory.cpp +++ b/cpp/src/Ice/ReferenceFactory.cpp @@ -417,7 +417,7 @@ IceInternal::ReferenceFactory::create(const string& str) if(beg == string::npos) { - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, "", routerInfo, + return create(ident, _instance->getDefaultContext(), facet, mode, secure, "", routerInfo, locatorInfo, _instance->defaultsAndOverrides()->defaultCollocationOptimization, _instance->defaultsAndOverrides()->defaultLocatorCacheTimeout); } @@ -471,7 +471,7 @@ IceInternal::ReferenceFactory::create(const string& str) } } - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, endpoints, + return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints, routerInfo, _instance->defaultsAndOverrides()->defaultCollocationOptimization); break; } @@ -522,7 +522,7 @@ IceInternal::ReferenceFactory::create(const string& str) adapter = tmpAdapter; } - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, adapter, + return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapter, routerInfo, locatorInfo, _instance->defaultsAndOverrides()->defaultCollocationOptimization, _instance->defaultsAndOverrides()->defaultLocatorCacheTimeout); break; @@ -594,13 +594,13 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) EndpointIPtr endpoint = _instance->endpointFactoryManager()->read(s); endpoints.push_back(endpoint); } - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, endpoints, + return create(ident, _instance->getDefaultContext(), facet, mode, secure, endpoints, routerInfo, _instance->defaultsAndOverrides()->defaultCollocationOptimization); } else { s->read(adapterId); - return create(ident, _instance->initializationData().defaultContext, facet, mode, secure, adapterId, + return create(ident, _instance->getDefaultContext(), facet, mode, secure, adapterId, routerInfo, locatorInfo, _instance->defaultsAndOverrides()->defaultCollocationOptimization, _instance->defaultsAndOverrides()->defaultLocatorCacheTimeout); } |