diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-10-12 11:34:53 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-10-12 11:34:53 +0200 |
commit | 23c1e3b603a9d902593ffe9f99562fcda3af1589 (patch) | |
tree | 60ea7cdc0da5a9676ca12350ac82b069cc86eb5e /cpp/src/Glacier2/ClientBlobject.cpp | |
parent | .NET demo project updates (diff) | |
download | ice-23c1e3b603a9d902593ffe9f99562fcda3af1589.tar.bz2 ice-23c1e3b603a9d902593ffe9f99562fcda3af1589.tar.xz ice-23c1e3b603a9d902593ffe9f99562fcda3af1589.zip |
Added support for Glacier2 MX and fixed ICE-4880
Diffstat (limited to 'cpp/src/Glacier2/ClientBlobject.cpp')
-rw-r--r-- | cpp/src/Glacier2/ClientBlobject.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cpp/src/Glacier2/ClientBlobject.cpp b/cpp/src/Glacier2/ClientBlobject.cpp index 6f682d7aaca..696afeda2de 100644 --- a/cpp/src/Glacier2/ClientBlobject.cpp +++ b/cpp/src/Glacier2/ClientBlobject.cpp @@ -18,10 +18,11 @@ using namespace Glacier2; Glacier2::ClientBlobject::ClientBlobject(const InstancePtr& instance, const FilterManagerPtr& filters, - const Ice::Context& sslContext): + const Ice::Context& sslContext, + const RoutingTablePtr& routingTable): Glacier2::Blobject(instance, 0, sslContext), - _routingTable(new RoutingTable(_instance->communicator(), _instance->proxyVerifier())), + _routingTable(routingTable), _filters(filters), _rejectTraceLevel(_instance->properties()->getPropertyAsInt("Glacier2.Client.Trace.Reject")) { @@ -129,12 +130,6 @@ Glacier2::ClientBlobject::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& invoke(proxy, amdCB, inParams, current); } -ObjectProxySeq -Glacier2::ClientBlobject::add(const ObjectProxySeq& proxies, const Current& current) -{ - return _routingTable->add(proxies, current); -} - StringSetPtr ClientBlobject::categories() { |