diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-04-15 09:41:21 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-04-15 09:41:21 +0200 |
| commit | 54884a0b4c139118fc49498b6d6715d7d9ab718c (patch) | |
| tree | 1f00091ad68543b3dc9828f27e32c0d9f7d072fe /cpp/src/Ice/Reference.cpp | |
| parent | VC11 fixes for PHP 5.5 (diff) | |
| download | ice-54884a0b4c139118fc49498b6d6715d7d9ab718c.tar.bz2 ice-54884a0b4c139118fc49498b6d6715d7d9ab718c.tar.xz ice-54884a0b4c139118fc49498b6d6715d7d9ab718c.zip | |
Added support for IceGrid custom load balancing
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index eff60ccd5d6..36769c179b9 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -489,14 +489,15 @@ IceInternal::Reference::Reference(const InstancePtr& instance, Mode mode, bool secure, const ProtocolVersion& protocol, - const EncodingVersion& encoding) : + const EncodingVersion& encoding, + const Ice::Context& ctx) : _hashInitialized(false), _instance(instance), _communicator(communicator), _mode(mode), _secure(secure), _identity(id), - _context(new SharedContext), + _context(new SharedContext(ctx)), _facet(facet), _protocol(protocol), _encoding(encoding), @@ -553,7 +554,7 @@ IceInternal::FixedReference::FixedReference(const InstancePtr& instance, bool secure, const EncodingVersion& encoding, const ConnectionIPtr& fixedConnection) : - Reference(instance, communicator, id, facet, mode, secure, Ice::Protocol_1_0, encoding), + Reference(instance, communicator, id, facet, mode, secure, Ice::Protocol_1_0, encoding, Ice::Context()), _fixedConnection(fixedConnection) { } @@ -873,8 +874,9 @@ IceInternal::RoutableReference::RoutableReference(const InstancePtr& instance, bool cacheConnection, bool preferSecure, EndpointSelectionType endpointSelection, - int locatorCacheTimeout) : - Reference(instance, communicator, id, facet, mode, secure, protocol, encoding), + int locatorCacheTimeout, + const Ice::Context& ctx) : + Reference(instance, communicator, id, facet, mode, secure, protocol, encoding, ctx), _endpoints(endpoints), _adapterId(adapterId), _locatorInfo(locatorInfo), |