diff options
| author | Mark Spruiell <mes@zeroc.com> | 2007-01-26 16:58:00 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2007-01-26 16:58:00 +0000 |
| commit | 71f7fff702750e9b779f645d21075562e5c80a40 (patch) | |
| tree | 0f059491911ecc5ea3f6c680b0ae05d0f67e7bfd /cpp/src/Ice/ObjectAdapterI.cpp | |
| parent | Synced with other assemby files (diff) | |
| download | ice-71f7fff702750e9b779f645d21075562e5c80a40.tar.bz2 ice-71f7fff702750e9b779f645d21075562e5c80a40.tar.xz ice-71f7fff702750e9b779f645d21075562e5c80a40.zip | |
preserve proxy settings for CacheConnection, EndpointSelection,
ThreadPerConnection
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index feb6f4df9af..483ad0542a3 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -1026,7 +1026,8 @@ Ice::ObjectAdapterI::newDirectProxy(const Identity& ident, const string& facet) ReferencePtr ref = _instance->referenceFactory()->create( ident, _instance->getDefaultContext(), facet, Reference::ModeTwoway, false, _instance->defaultsAndOverrides()->defaultPreferSecure, endpoints, 0, - _instance->defaultsAndOverrides()->defaultCollocationOptimization); + _instance->defaultsAndOverrides()->defaultCollocationOptimization, true, + _instance->defaultsAndOverrides()->defaultEndpointSelection, _instance->threadPerConnection()); return _instance->proxyFactory()->referenceToProxy(ref); } @@ -1040,7 +1041,8 @@ Ice::ObjectAdapterI::newIndirectProxy(const Identity& ident, const string& facet ReferencePtr ref = _instance->referenceFactory()->create( ident, _instance->getDefaultContext(), facet, Reference::ModeTwoway, false, _instance->defaultsAndOverrides()->defaultPreferSecure, id, 0, - _locatorInfo, _instance->defaultsAndOverrides()->defaultCollocationOptimization, + _locatorInfo, _instance->defaultsAndOverrides()->defaultCollocationOptimization, true, + _instance->defaultsAndOverrides()->defaultEndpointSelection, _instance->threadPerConnection(), _instance->defaultsAndOverrides()->defaultLocatorCacheTimeout); // |