Fixed ICE-3490: guarantee invocation serialization for proxies which are equal

1 files changed, 4 insertions, 2 deletions

diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h
index c5bc6602766..53c9e33e070 100644
--- a/cpp/src/Ice/ConnectRequestHandler.h
+++ b/cpp/src/Ice/ConnectRequestHandler.h
@@ -35,7 +35,7 @@ public:
     ConnectRequestHandler(const ReferencePtr&, const Ice::ObjectPrx&);
     virtual ~ConnectRequestHandler();
 
-    virtual RequestHandlerPtr connect();
+    virtual RequestHandlerPtr connect(const Ice::ObjectPrx&);
     virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&);
 
     virtual void prepareBatchRequest(BasicStream*);
@@ -75,6 +75,7 @@ private:
     };
 
     Ice::ObjectPrx _proxy;
+    std::vector<Ice::ObjectPrx> _proxies;
 
     const bool _batchAutoFlush;
 
@@ -88,7 +89,8 @@ private:
     bool _batchRequestInProgress;
     size_t _batchRequestsSize;
     BasicStream _batchStream;
-    bool _updateRequestHandler;
+
+    RequestHandlerPtr _connectionRequestHandler;
 };
 typedef IceUtil::Handle<ConnectRequestHandler> ConnectRequestHandlerPtr;