From d8da15a2d803da81b76568d0c8f620f8ed26d0fa Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Wed, 22 Oct 2014 16:33:13 +0200 Subject: Fixed ICE-3490: guarantee invocation serialization for proxies which are equal --- cpp/src/Ice/ConnectionRequestHandler.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'cpp/src/Ice/ConnectionRequestHandler.cpp') diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp index a94d3e7180a..423a637c70c 100644 --- a/cpp/src/Ice/ConnectionRequestHandler.cpp +++ b/cpp/src/Ice/ConnectionRequestHandler.cpp @@ -18,17 +18,6 @@ using namespace std; using namespace IceInternal; -ConnectionRequestHandler::ConnectionRequestHandler(const ReferencePtr& reference, const Ice::ObjectPrx& proxy) : - RequestHandler(reference) -{ - _connection = _reference->getConnection(_compress); - RouterInfoPtr ri = reference->getRouterInfo(); - if(ri) - { - ri->addProxy(proxy); - } -} - ConnectionRequestHandler::ConnectionRequestHandler(const ReferencePtr& reference, const Ice::ConnectionIPtr& connection, bool compress) : @@ -39,10 +28,9 @@ ConnectionRequestHandler::ConnectionRequestHandler(const ReferencePtr& reference } RequestHandlerPtr -ConnectionRequestHandler::connect() +ConnectionRequestHandler::connect(const Ice::ObjectPrx&) { - assert(false); // This request handler is only created after connection binding. - return 0; + return this; } RequestHandlerPtr -- cgit v1.2.3