From d8da15a2d803da81b76568d0c8f620f8ed26d0fa Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Wed, 22 Oct 2014 16:33:13 +0200
Subject: Fixed ICE-3490: guarantee invocation serialization for proxies which
 are equal

---
 cpp/src/Ice/RequestHandlerFactory.cpp | 71 +++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 cpp/src/Ice/RequestHandlerFactory.cpp

(limited to 'cpp/src/Ice/RequestHandlerFactory.cpp')

diff --git a/cpp/src/Ice/RequestHandlerFactory.cpp b/cpp/src/Ice/RequestHandlerFactory.cpp
new file mode 100644
index 00000000000..e21344c98d9
--- /dev/null
+++ b/cpp/src/Ice/RequestHandlerFactory.cpp
@@ -0,0 +1,71 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/RequestHandlerFactory.h>
+#include <Ice/CollocatedRequestHandler.h>
+#include <Ice/ConnectRequestHandler.h>
+#include <Ice/CollocatedRequestHandler.h>
+#include <Ice/Reference.h>
+#include <Ice/ObjectAdapterFactory.h>
+#include <Ice/Instance.h>
+
+using namespace std;
+using namespace IceInternal;
+
+RequestHandlerFactory::RequestHandlerFactory(const InstancePtr& instance) : _instance(instance)
+{
+}
+
+RequestHandlerPtr 
+IceInternal::RequestHandlerFactory::getRequestHandler(const ReferencePtr& ref, const Ice::ObjectPrx& proxy)
+{
+    if(ref->getCollocationOptimized())
+    {
+        Ice::ObjectAdapterPtr adapter = _instance->objectAdapterFactory()->findObjectAdapter(proxy);
+        if(adapter)
+        {
+            return new CollocatedRequestHandler(ref, adapter);
+        }
+    }
+
+    if(ref->getCacheConnection())
+    {
+        Lock sync(*this);
+        
+        map<ReferencePtr, RequestHandlerPtr>::iterator p = _handlers.find(ref);
+        if(p != _handlers.end())
+        {
+            return p->second;
+        }
+        
+        RequestHandlerPtr handler = new ConnectRequestHandler(ref, proxy);
+        _handlers.insert(make_pair(ref, handler));
+        return handler;
+    }
+    else
+    {
+        return new ConnectRequestHandler(ref, proxy);
+    }
+}
+
+void 
+IceInternal::RequestHandlerFactory::removeRequestHandler(const ReferencePtr& ref, const RequestHandlerPtr& handler)
+{
+    if(ref->getCacheConnection())
+    {
+        Lock sync(*this);
+        map<ReferencePtr, RequestHandlerPtr>::iterator p = _handlers.find(ref);
+        assert(p != _handlers.end() && p->second.get() == handler.get());
+        if(p != _handlers.end())
+        {
+            _handlers.erase(p);
+        }
+    }
+}
+
-- 
cgit v1.2.3