summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionRequestHandler.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-10-22 16:33:13 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-10-22 16:33:13 +0200
commitd8da15a2d803da81b76568d0c8f620f8ed26d0fa (patch)
treef193067905624d61e0e8a3e6cd7d2498b9bf1873 /cpp/src/Ice/ConnectionRequestHandler.cpp
parentFixed demo dist to allow gradle build of java demos (diff)
downloadice-d8da15a2d803da81b76568d0c8f620f8ed26d0fa.tar.bz2
ice-d8da15a2d803da81b76568d0c8f620f8ed26d0fa.tar.xz
ice-d8da15a2d803da81b76568d0c8f620f8ed26d0fa.zip
Fixed ICE-3490: guarantee invocation serialization for proxies which are equal
Diffstat (limited to 'cpp/src/Ice/ConnectionRequestHandler.cpp')
-rw-r--r--cpp/src/Ice/ConnectionRequestHandler.cpp16
1 files changed, 2 insertions, 14 deletions
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